Adonis:
Test again
Merge branches 'master' and 'master' of https://github.com/adonis1992/Hallo-Welt

Conflicts:
	HalloWelt/AndroidManifest.xml
	HalloWelt/bin/AndroidManifest.xml