Bugfix #0000226
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/code/Bengine/Game/Controller/MSG.php