404 page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/php/Messages.class.php