fixes #211
fixes #214
Merge branch 'master' of http://github.com/solutionsresourceinc/procurementtrackingsystem