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