Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus

# Conflicts:
#	OlympusServices/app/src/main/res/layout/activity_log_in.xml

OlympusServices/.idea/misc.xml

@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

OlympusServices/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>

OlympusServices/app/src/main/res/layout/activity_log_in.xml

@@ -31,8 +31,8 @@
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:background="@color/colorWhite"
-        android:hint="Username"
         android:textSize="15sp"
+        android:hint="@string/username"
         android:layout_marginTop="40dp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"
@@ -45,8 +45,8 @@
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:background="@drawable/customborder"
-        android:hint="Password"
         android:textSize="15sp"
+        android:hint="@string/password"
         android:layout_marginTop="20dp"
         app:met_baseColor="@android:color/white"
         app:met_floatingLabel="highlight"

OlympusServices/app/src/main/res/values/strings.xml

@@ -19,6 +19,8 @@
     <string name="login">Log In</string>
     <string name="newusername">Enter Username</string>
     <string name="newpassword">Enter Password</string>
+    <string name="password">Password</string>
+    <string name="username">Username</string>
     <string-array name="roles">
         <item>Admin</item>
         <item>User</item>