reorder
reimport vocabularies
changelog
Updating version on trunk after tagging