Format changes login and register
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/intermediates/tmp/dex/debug/inputList.txt
Format Changes