Finalize the duplication of projects: refs #285 #321
Merge branch 'dev' of github.com:projestimate/projestimate into dev