favicon update
Merge branch 'master' into home_improvements

Conflicts:
	templates/base.html