Some fixes
Merge branch 'master' of https://github.com/netcraft/netcraft.co.il
Merge branch 'master' of https://github.com/netcraft/netcraft.co.il
Multiple fixes
Merge branch 'master' of https://github.com/netcraft/netcraft.co.il

Conflicts:
	app/templates/partials/header.hbs