Merge remote-tracking branch 'origin/master'

Conflicts:
	PHMS/src/main/AndroidManifest.xml
	PHMS/src/main/java/com/cse3310/phms/ui/activities/LoginActivity.java
	PHMS/src/main/res/values/styles.xml
Merge remote-tracking branch 'origin/dev' into dev1
Merge branch 'emery-branch' into dev
build fix