refs #546, refs #550
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev