structure updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/shared/_footer.html.erb