UI updates
Register implemented
Register bugfixes

Location can now be retrieved from wifi
Merge branch 'develop_register' into develop

Conflicts:
	Client/bin/BoredAtLecture.apk
	Client/bin/classes.dex
	Client/bin/classes/software_engineering/bal_ui/DisplayChat$1.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat$5.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat.class
	Client/bin/classes/software_engineering/bal_ui/DisplayLobbyList.class
	Client/bin/classes/software_engineering/bal_ui/DisplayLoginScreen$1.class
	Client/bin/classes/software_engineering/bal_ui/DisplayLoginScreen.class
	Client/bin/classes/software_engineering/bal_ui/DisplayRegistration$2.class
	Client/bin/classes/software_engineering/bal_ui/DisplayRegistration.class
	Client/bin/resources.ap_
Changed package names
Merge branch 'develop'

Conflicts:
	Client/bin/classes/com/userinterface/R$drawable.class
	Client/bin/classes/location/LocationFinder.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat$2.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat$3.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat$4.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat$5.class
	Client/bin/classes/software_engineering/bal_ui/DisplayChat.class
	Client/bin/classes/software_engineering/bal_ui/DisplayLoginScreen.class
	Client/bin/classes/software_engineering/bal_ui/LocationFinder$1.class
	Client/bin/classes/software_engineering/bal_ui/LocationFinder$2.class
	Client/bin/classes/userinterface/DisplayInfo.class
	Client/bin/classes/userinterface/DisplaySettings$1.class
	Client/bin/classes/userinterface/DisplayTicTacToe.class
	Client/bin/classes/userinterface/ImageAdapter.class