Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/TaskBoxx.iml" filepath="$PROJECT_DIR$/TaskBoxx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Taskboxx.iml" filepath="$PROJECT_DIR$/Taskboxx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#504867</color>
-    <color name="colorPrimaryDark">#504867</color>
-    <color name="colorAccent">#7DAAD0</color>
+    <color name="colorPrimary">#3b5998</color>
+    <color name="colorPrimaryDark">#3b5998</color>
+    <color name="colorAccent">#8b9dc3</color>
 </resources>