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