refs #500, refs #516
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev
refs #277