refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	moderator/index.html
	src/application/actions/submit.php