Fix Performance label
Merge remote-tracking branch 'origin/Development'
Merge Conflict Solve
Add to Menu grades_management
General repot round category total
General report student list order by carnet
General report change colors
Admin Can edit Grades after course ended
Merge remote-tracking branch 'origin/Development'

Conflicts:
	src/cpfecys/controllers/activity_control.py
	src/cpfecys/models/menu.py
	src/cpfecys/views/activity_control/General_report_activities.html
Merge remote-tracking branch 'origin/master' into Development