Request Change

The request change for activities
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	src/cpfecys/models/db.py
	src/cpfecys/views/activity_control/activity.html