daily
Merge branch 'foundation'

Conflicts:
	app/views/layouts/_navigation.html.haml