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

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LocationActivity.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedInChild.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedInParent.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/RegisterChild.java
Merge pull request #22 from TommyIsGod/master

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