Merge pull request #22 from TommyIsGod/master

Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily
Asynctask added to msservice and lockscreen to manifest
Merge branch 'master' of https://github.com/kaareandersen/WheresMyFamily

Conflicts:
	app/src/main/java/dk/projekt/bachelor/wheresmyfamily/activities/LoggedInParent.java