refs #370, refs #371 (import export)
Merge branch 'dev' of github.com:projestimate/projestimate into dev

Conflicts:
	app/helpers/wbs_activity_elements_helper.rb