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

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedInParent.java
	app/src/main/res/layout/activity_logged_in_parent.xml
Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedInParent.java
	app/src/main/res/layout/activity_logged_in_parent.xml
Med map activity
med map og merged
Merge pull request #15 from TommyIsGod/master

Med map og merged