Tutor/Student transitions improved
Merge branch 'master' of https://github.com/mpu42/UberTutor

Conflicts:
	UberTutorAndroid/app/src/main/res/layout/new_account_page.xml