no message
Merge branch 'alex' of https://github.com/PhpNinja/magma-web

Conflicts:
	language/esp.php