Starting new sign in screen
Merge branch 'master' into login

Conflicts:
	kARTography/res/layout/poi_detail.xml
New Login Screen
Merge branch 'master' into login

Conflicts:
	kARTography/AndroidManifest.xml
	kARTography/res/values/strings.xml
Styling new login screen
Removing parallel uploading
Merge pull request #44 from koalahamlet/login

New login screen