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

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

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

Current user set