Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_add_user.xml
#	app/src/main/res/layout/activity_edit__hosp.xml
#	app/src/main/res/layout/activity_help.xml
#	app/src/main/res/layout/activity_location.xml
#	app/src/main/res/layout/activity_login1.xml
#	app/src/main/res/layout/activity_remove__hosp.xml
#	app/src/main/res/layout/activity_user1.xml
#	app/src/main/res/layout/activity_view__hosp.xml

.idea/modules.xml

@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Help.iml" filepath="$PROJECT_DIR$/Help.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/help-master.iml" filepath="$PROJECT_DIR$/help-master.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.google.gms:google-services:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong