Merge branch 'master' of github.com:telerik/team-spirit

# Conflicts:
#	app/app.css

app/App_Resources/Android/values/styles.xml

@@ -26,7 +26,8 @@
         <item name="colorPrimary">@color/ns_primary</item>
         <item name="colorPrimaryDark">@color/ns_primaryDark</item>
         <item name="colorAccent">@color/ns_accent</item>
-        <item name="colorControlNormal">#fff</item>
+        <item name="colorControlNormal">#000</item>
+        <item name="actionOverflowButtonStyle">@style/OverflowMenuButton</item>
     </style>
 
     <style name="AppTheme" parent="AppThemeBase">
@@ -42,4 +43,8 @@
 
     <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
     </style>
+
+    <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:src">@drawable/icon_overflow</item>
+    </style>
 </resources>

app/app.css

@@ -1,6 +1,4 @@
-@import '~/css/core.light.css'; 
-
-@import url('~/css/core.light.css');
+@import '~/css/core.light.css';
 @import url('~/platform.css');
 
 .if {