SEO round 3 plus favicon
Merge branch 'develop'

Conflicts:
	views/_layout.jade
Added favicon