Merge remote-tracking branch 'origin/master'

Conflicts:
	src/zo2_hallo/assets/zo2/images/background-patterns/pattern4_black.png
	src/zo2_hallo/assets/zo2/images/background-patterns/pattern5_black.png
	src/zo2_hallo/assets/zo2/images/background-patterns/pattern6_black.png
	src/zo2_hallo/assets/zo2/images/background-patterns/pattern8_black.png
remove alert