strange git thing
test
strange git thing
strange git thing
Merge remote-tracking branch 'origin/sockets' into sockets

Conflicts:
	app/modules/shared/login/controllers/RenameController.php
Merge remote-tracking branch 'origin/sockets' into sockets