Add ability to load assets from another template …

- adding param 'template' to
    {javascripts file='assets/js/libs/jquery.js' template='baseTemplate'}
    {stylesheets file='assets/less/styles.less' filters='less'  template='baseTemplate' }
    {images file=assets/img/picture.png' template='baseTemplate'}
Remove unused use statement
Fix If statement
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
Merge branch 'master' of https://github.com/gmorel/thelia

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
Remove unused use statement
Merge pull request #232 from gmorel/master

Add ability to load assets from another template …