Enhance process to maintain Master Data : refs #326
Merge branch 'dev' of github.com:projestimate/projestimate into dev