frontend optimized
Merge branch 'master' into frontpage-update

Conflicts:
	_includes/menus.html
Merge pull request #1 from javers/frontpage-update

frontend optimized