Templating loader fix
Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting
Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting
Template locator update and move inside Library directory
Merge pull request #48 from claroline/templating-overwriting

Fix error in test environment