Merge branch 'master' into Adar
Merge branch 'Eran'
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'
reports: add phase checkbox list
reports: add season
reports: add tv and tv type
Merge branch 'Adar'
Merge branch 'master' into Eran