most
Merge branch 'master' of github.com:Grapheme/Universiality
bug fixes and db edits
Merge branch 'master' of github.com:Grapheme/Universiality