fix stylesheet calls
Merge branch 'master' into jquery
started moving interventions to jquery
checklist display logic switched to jquery, next is that autoset others stuff
checklist display logic switched to jquery, next is that autoset others stuff
update rails for security fix
Merge branch 'master' into jquery

Conflicts:
	Gemfile.lock