Favicon
Favicon fix
Added reply-to to email
Merge branch 'production'

Conflicts:
	urbanoutlines/urbanoutlines/main/templates/base.html
Merge branch 'master' of github.com:hochbergg/petulant-avenger