Debut du travail sur le B.O.
Changement emplacmement templates
Merge branch 'franck' into admin

Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php
remove composer.lock from index
track admin ârt
Merge branch 'admin' of https://github.com/thelia/thelia into admin

Conflicts:
	.gitignore
typo
fix admin template location
added admin template
Intégration de Assetic
Integration de assetic
Integration de Assetic
modify .htaccess
ignore web/assets directory
change rule in .htaccess and fix link for asset
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
poc integrate smarty in DI
Integration of Assetic in SmartyParser, extended it to Admin (we can now
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq