Cleanup
Track Location

Stalkers
Update Login.java

Not logged in message fixed. Replaced it with a text instead of the @string/login_notloggedin resource. This didnt work, so reverted to the text "U bent nog niet ingelogd".
Merge remote-tracking branch 'origin/master' into list_to_listview

Conflicts:
	.idea/libraries/android_support_v4.xml
	.idea/libraries/bolts.xml
	.idea/libraries/play_services_4_4_52.xml
	app/src/main/java/com/resist/movelife/DatabaseUpdater.java
	app/src/main/java/com/resist/movelife/ServerConnection.java
master into branch