Add question
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	src/cpfecys/views/activity_control/General_report_activities.html