fixes #281
Fixes #281 fixes #280 fixes #279 fixes #276
Merge branch 'master' of http://github.com/solutionsresourceinc/procurementtrackingsystem