Fix model/database inconsistencies
Merge branch 'master' of https://github.com/Hellblazer/Ultrastructure.git