refs #489, refs #482, refs #447, refs #280
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev