refs #319
Merge branch 'dev' of github.com:projestimate/projestimate into dev
refs #247
Merge branch 'dev' of github.com:projestimate/projestimate into dev