kaareandersen/WheresMyFamily — pull request #22 by TommyIsGod (2014-11-24 10:44:49+00:00)
Title: 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