Design

Design: buttons, xml, plaatjes aangepast en sommige verwijderd.
Merge remote-tracking branch 'origin/master' into Kevin

Conflicts:
	app/src/main/java/com/resist/movelife/Map.java
FR 2
FR 3
removeFriend
Passworden zijn beschikbaar in de changepassword klasse, getPassword() public gemaakt in de DatabaseUpdater.
addFriend
Toast messages gefixt voor changepassword en changeemail activities. Ook de server updater laten starten bij een OnResume(). Buttons van changeemail en changepassword ge-hide bij geen internetconnectie.
Merge pull request #20 from MoveLife/Armindo

Toast messages gefixt voor changepassword en changeemail activities. Ook...
Design, slideshow gemaakt
changePassword #1
changePassword & changeEmail
Merge remote-tracking branch 'origin/master' into list_to_listview

Conflicts:
	app/src/main/java/com/resist/movelife/Map.java
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/Kevin' into list_to_listview

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.idea/libraries/play_services_4_4_52.xml
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/resist/movelife/Menu.java
	app/src/main/res/layout/alle_bedrijf_info.xml
	app/src/main/res/layout/bedrijf_info.xml
	app/src/main/res/layout/events.xml
	app/src/main/res/layout/friends.xml
	app/src/main/res/layout/friends_info.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
kevin branch merge