Theme generator update (Views, Translation, Templates, Preview, JavaScript, etc)
Merge branch 'master' of https://github.com/claroline/Claroline into theme-generator

Conflicts:
	src/core/Claroline/CoreBundle/Resources/config/routing.yml
Theme generator update
Merge branch 'master' of https://github.com/claroline/Claroline into theme-generator
Merge pull request #14 from claroline/theme-generator

Theme generator