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

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

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

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedIn.java
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/RegisterChild.java
Comment
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedIn.java
	app/src/main/res/values/strings.xml
Merge pull request #10 from TommyIsGod/master

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