added favicon
Merge commit 'f424456'

Conflicts:
	app/theme/templates/base.html