Correct menu problem
Rename a menu item
Merge branch 'master' of https://github.com/jacques-gegout/hackathon-2013

Conflicts:
	static/style.css
Merge branch 'master' of https://github.com/jacques-gegout/hackathon-2013