PE-WBS-Project Management: refs #367
Merge branch 'dev' of github.com:projestimate/projestimate into dev