Embedded test (phase 3): refs #321
Merge branch 'dev' of github.com:projestimate/projestimate into dev