refs #580, refs #568 (i fix the problem for pemodules and create 'defined' in master_data_helper)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev