CR fixes complete except the js OO
CR fixes
Merge branch 'develop' into server_setup

Conflicts:
	app/models/concerns/requirement_asm.rb