ticket:29 comitting old work
Merge branch 't29_android_passive_sos' of github.com:42cc/p2psafety into t29_android_passive_sos

Conflicts:
	p2psafety-android/p2psafety/src/ua/p2psafety/fragments/PassiveSosFragment.java