reste history et multimedia
Merge branch 'design' of https://github.com/YADev/Club-Judo into design

Conflicts:
	app/View/Layouts/default.ctp
	app/webroot/css/styles.css
	app/webroot/js/scripts.js