Minor Changes.
Merge branch 'master' of
https://github.com/MadavanBros/Android-Bridge.git

Conflicts:
	Android Bridge/res/layout/activity_login.xml
Merge branch 'master' of
https://github.com/MadavanBros/Android-Bridge.git

Conflicts:
	Android Bridge/res/layout/activity_game_room.xml
	Android Bridge/res/layout/activity_login.xml