kaareandersen/WheresMyFamily — pull request #8 by TommyIsGod (2014-10-14 08:46:26+00:00)
Title: Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
app/src/main/AndroidManifest.xml
app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedIn.java
app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedInChild.java
app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/Register_child.java
app/src/main/res/layout/activity_logged_in.xml
app/src/main/res/values/strings.xml