Merge branch 'develop'
Merge branch 'develop' into 'master'
Fix for adding users
Remove taxonomies when no longer necessary.