Merge branch 'bpa'
PTO
Add office option to guesstimates