flos änderung
Merge branch 'master' of https://github.com/dwandrowec/wanni_rep

Conflicts:
	wassApp.txt