Merge commit '88dd548176ea3fdb5f3db02a7a5aa3fa64a00d10' into production
Merge commit '4e5f5b6967ae212cedf006eb1e11e1ed3eb4bb63' into production
Merge commit '349954e4b79665704701bfccae932d9b7bbc2534' into production
put title back into intervention definition summary
Merge commit '05d9e488160b0234a61b3da679fed2d70bdf2321' into production
Merge branch 'rm_production' into production
disabled progress monitors should no longer show up [#758 state:complete]
Merge commit '3331b6fca9441e6dd75d57591d4f7dcb115b66e2' into production
Merge commit '9b11d67d0b39f7c528f135e1fcb3df54c91040e3' into production
Merge commit 'b21303f1e677b7c53f30648d5cb7f98f4381293c' into production
remove references to district_quicklist, refactor filtering for intervention definitions

Conflicts:

	app/models/intervention_definition.rb
forgot to remove the district_quicklist specs

Conflicts:

	spec/models/intervention_definition_spec.rb
put title back into intervention definition summary
Merge branch 'rm_production' into production

Conflicts:
	app/models/intervention_definition.rb
Merge branch 'production'