Redesign login activity
Merge branch 'develop' of github.com:Amab/SWADroid into develop

Conflicts:
	SWADroid/res/layout/main.xml
Resolved merge conflict