Favicon fixed.
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/layouts/iframe.html.haml