Closed #22.
Closed #36.
Closed #41.
Merge branch 'master' of github.com:champierre/mopa

Conflicts:
	app/views/layouts/application.html.haml