login works
Merge branch 'm1b'

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml