favicon
Merge branch 'master' of https://github.com/safe-net/snaplogin
Merge branch 'master' of https://github.com/safe-net/snaplogin

Conflicts:
	app/views/saml_idp/idp/new.html.slim
Merge branch 'master' of https://github.com/safe-net/snaplogin

Conflicts:
	app/views/root/index.slim
last minute tidy up