ui changes
Merge branch 'master' of https://github.com/ani29/Rapid-Serve

Conflicts:
	Android/RapidServeField/res/layout/activity_login.xml
Merge branch 'master' of https://github.com/ani29/Rapid-Serve