Quelques tests
Merge branch 'master' of https://github.com/MakeYourWeb/MYW-0.1

Conflicts:
	templates/basic_style/header.php