Templating overwrite update + submodule update
Templating locator update
Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting
Single quotes for everyone :S
Merge pull request #41 from claroline/templating-overwriting

Templating overwrite update + submodule update