no message
Merge branch 'master' into sambalgames

Conflicts:
	templates/default.tpl.php