Merge branch 'master' into Adar
reports: checkbox list UI
reports: fix checkbox list
Merge branch 'master' into Adar

Conflicts:
	udobuApp/app/controllers/app/reports_controller.rb
reports: add stages checkbox list
Merge branch 'Adar'