af
Merge remote-tracking branch 'origin/master'

Conflicts:
	icon.png
	splash.png