resf #384
refs #427 and some small bugs
Merge branch 'dev' of github.com:projestimate/projestimate into dev