add terms to db
add users and user organization assignments migration
building up admin users feature
Merge branch 'master' of https://github.com/idbygeorge/salsa
fix sub org structure, tie in to user permissions