Disable Project WBS Activity element Delete refs #449
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/attribute_modules_controller.rb