Update composer.json
Remove prefix, store name on Taxonomy, add default entities
Fix specs
Merge remote branch 'upstream/master'