Remove custom vocabulary tab.
Fix bugs in migration.
Remove custom vocabulary.
Merge branch 'develop' into resource-templates

Conflicts:
	application/config/module.config.php