Merge branch 'master' into ysy_latest_setting

2017-01-13 18:03:13 +05:30
parent 385bd0a36d adc58aa2d4
commit 591cccc5b9
17 changed files with 772 additions and 369 deletions
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <item
        android:id="@+id/action_planogram"
-        android:icon="@mipmap/star"
+        android:icon="@mipmap/ref_images_white"
        android:orderInCategory="100"
        android:title="planogram"
        app:showAsAction="always" />