kaareandersen/WheresMyFamily — pull request #6 by TommyIsGod (2014-10-08 11:22:03+00:00)
Title: Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/dk/projekt/bachelor/wheresmyfamily/Main.java
app/src/main/res/values/strings.xml