oki
Merge branch 'refs/heads/master' into ajout_stats

Conflicts:
	View/Users/view.ctp
	webroot/css/thiinky.css
	webroot/js/thiinky.js
yuio
oki..