added favicon
Merge branch 'master' into dev

Conflicts:
	app/theme/templates/base.html