Made sure all themes matched
Review Changes and fixed login layout
Merge branch 'master' of https://github.com/mboker/RehabCoachV4.git

Conflicts:
	bin/classes.dex
	bin/classes/com/example/rehab_coachv1/DuringActivity.class
	bin/classes/com/example/rehab_coachv1/LostActivity.class
	src/com/example/rehab_coachv1/DuringActivity.java
	src/com/example/rehab_coachv1/LostActivity.java