strings en layout

Een aantal strings in strings.xml gezet plus layout alle bedrijven
aangepast.
Layout allebedrijfinfo (For fun)
Rating zichtbaar op map en listview
eerste versie events class, layout voor als listview leeg is, custom adapter voor vrienden + layouts
Merge remote-tracking branch 'origin/master' into list_to_listview
master

Van master
master in branch

van master in branch
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
event fix

Kleine event fix
Merge remote-tracking branch 'origin/master' into list_to_listview

Conflicts:
	app/src/main/java/com/resist/movelife/DatabaseUpdater.java
	app/src/main/java/com/resist/movelife/ServerConnection.java
	app/src/main/res/values/strings.xml
Design, slideshow gemaakt
Events laten zien in bedrijfinfo + niewe adapters

Events
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
Plaatjes
Kevin branch into my branch
friends merge
Menu vanuit kevin branch