LoginActivity layout
Merge remote-tracking branch 'origin/master'
vieles
Merge remote-tracking branch 'origin/master'

Conflicts:
	zanoxbump/src/main/AndroidManifest.xml