Fixes #270 fixes #275
Merge branch 'master' of http://github.com/solutionsresourceinc/procurementtrackingsystem