sync mapping (closes #22)
Merge branch 'master' into sync-mapping
checkstyle fixing
Merge pull request #39 from claroline/sync-mapping

Sync mapping