no message
Merge branch 'master' of https://github.com/BitPrepared/dreamland-portal

Conflicts:
	includes/sfide.php