add otherType column to DB
fix conflict
Merge branch 'master' of https://github.com/solutionsresourceinc/procurementtrackingsystem