Install TaxonomyBundle via composer
Merge branch 'taxonomybundle' of https://github.com/purplefish32/Claroline into
purplefish32-taxonomybundle

Conflicts:
	composer.json
	composer.lock
Merge branch 'master' of https://github.com/claroline/Claroline