Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

GSKMTOrange/src/main/res/layout/activity_category_wise_performance.xml

@@ -29,6 +29,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@color/colorPrimary"
-        app:srcCompat="@drawable/save_icon" />
+        app:srcCompat="@drawable/right_arrow" />
 
 </android.support.design.widget.CoordinatorLayout>

GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml

@@ -29,6 +29,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@color/colorPrimary"
+        android:visibility="gone"
         app:srcCompat="@drawable/save_icon" />
 
 </android.support.design.widget.CoordinatorLayout>

GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml

@@ -21,7 +21,7 @@
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
             android:paddingTop="10dp"
-            android:text="Category Performance"
+            android:text="Daily Data Menu"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@android:color/black" />
 

GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml

@@ -61,23 +61,11 @@
                     android:layout_weight="1.25"
                     android:orientation="vertical">
 
-                    <!--<TextView
+                    <TextView
+                        android:id="@+id/txt_mbq"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:gravity="center"
-                        android:paddingBottom="5dp"
-                        android:paddingTop="5dp"
-                        android:text="MBQ"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#222" />-->
-
-                    <EditText
-                        android:id="@+id/ed_mbq"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:inputType="number"
-                        android:maxLength="7"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="#222"
                         android:textColorHint="#666" />