ticket:38 various improvements
Merge branch 't38_supporter_screen'
Merge branch 'master' of github.com:42cc/p2psafety
ticket:69 merged master
Merge branch 'master' into t69_bug_with_send_updates

Conflicts:
	p2psafety-android/p2psafety/src/ua/p2psafety/XmppService.java