Testing smarty parser
Merge branch 'admin' of https://github.com/thelia/thelia into admin

Conflicts:
	core/lib/Thelia/Admin/Templating/Template.class.php
Test du sparty parser