harmonize and finalize modules, update consistency class: refs  #507
Merge branch 'dev' of github.com:projestimate/projestimate into dev