Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/Main.java
	app/src/main/res/values/strings.xml