fix white.png
Merge branch 'master' of https://github.com/chmanie/praxishuettemann

Conflicts:
	app/build/styles/styles.min.css
	app/styles/merge.css
	app/styles/overlay-apple.css
	app/styles/styles.min.css