Updated menu items
Merge branch 'master' of https://github.com/mriecken/hedgehog

Conflicts:
	Template.html