message
Merge origin/master

Conflicts:
	apps/frontend/lib/myUser.class.php