favicon generated transparent
Merge remote-tracking branch 'origin/favicon'

Conflicts:
	app/favicon/favicon.html