refs #333
Merge branch 'dev' of github.com:projestimate/projestimate into dev
resolve migration bugs
Merge branch 'dev' of github.com:projestimate/projestimate into dev