Estimation plan issue, module overlap: refs  #518
Merge branch 'dev' of github.com:projestimate/projestimate into dev