hid alerts
Merge branch 'homepage' into dev

Conflicts:
	app/views/frontend/layouts/default.blade.php
homepage stuff
Merge branch 'dev' into homepage
mediacloud