General_report_activities view changes
Merge branch 'Development' of https://github.com/ECYS-USAC/cpfecys into Development

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