add edit office
merged master fixed conflict
Merge branch 'master' of github.com:solutionsresourceinc/procurementTrackingSystem