pemodule helper br
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev
refs #528
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/helpers/pemodules_helper.rb