Asd
Merge branch 'master' of https://github.com/MoritzD/FreeFlow

Conflicts:
	IntelliJ/FreeFlow/AndroidManifest.xml