Merge branch 'new-table' of https://github.com/ElDeveloper/qiita into issue_487
modifying the db and fixing tests
Merge branch 'master' of https://github.com/biocore/qiita into issue_487_db
changes to db schema
addressing @wasade comments: varchar values are not nullable, changed typo, and added boolean to define which one is active
Merge pull request #578 from antgonza/issue_487_db

Issue 487 db