updates ui
Merge branch 'master' of https://github.com/guillaume-gouchon/html5-jam

Conflicts:
	client/app/styles/production/sidebar.scss
	client/app/templates/production/header.html