Added permalink strategies for taxonomies
Merge pull request #175 from WyriHaximus/master

Added permalink strategies for taxonomies
Updated lock.
More updates; react moved stuff.
lockfile bump; updated composer in build env to fix #169
Merge branch 'master' into cs-fix

Conflicts:
	src/Sculpin/Bundle/ContentTypesBundle/DependencyInjection/SculpinContentTypesExtension.php
merging with master