Configuration upload
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	application/classes/Controller/Participants.php
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	application/classes/Controller/Participants.php