doctrine return
Merge branch 'master' of https://github.com/AlexanderBasyrov/Satan

Conflicts:
	system/broker/composer.json
	system/broker/composer.lock
	system/broker/module/Socnet/src/Socnet/Controller/SocnetController.php
	system/broker/module/Socnet/src/Socnet/Model/Socnet.php
	system/broker/module/Socnet/view/socnet/socnet/index.phtml
	system/broker/vendor/autoload.php
	system/broker/vendor/composer/autoload_real.php
	system/broker/vendor/composer/installed.json
clients add