troep
up to date
ok euj
Merge branch 'master' into googlemaps

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/fileSnapshots.bin
	.gradle/1.10/taskArtifacts/outputFileStates.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin
	.idea/gradle.xml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/example/myapplication/movelife/AccountSettings.java
	app/src/main/java/example/myapplication/movelife/Categories.java
	app/src/main/java/example/myapplication/movelife/Company.java
	app/src/main/java/example/myapplication/movelife/Events.java
	app/src/main/java/example/myapplication/movelife/Friends.java
	app/src/main/java/example/myapplication/movelife/Login.java
	app/src/main/java/example/myapplication/movelife/Map.java
	app/src/main/java/example/myapplication/movelife/Menu.java
	app/src/main/java/example/myapplication/movelife/ServerConnection.java
	app/src/main/java/example/myapplication/movelife/Status.java
	app/src/main/res/drawable-hdpi/ic_supermarket.png
	app/src/main/res/drawable-mdpi/ic_supermarket.png
	app/src/main/res/drawable-xhdpi/ic_supermarket.png
	app/src/main/res/drawable-xxhdpi/ic_supermarket.png
	app/src/main/res/layout/login.xml
	app/src/main/res/layout/map.xml
	app/src/main/res/values/strings.xml
Merge pull request #7 from MoveLife/googlemaps

Googlemaps