Кнопочки работают
Merge branch 'master' of https://github.com/Workspaceforeus/socnet

Conflicts:
	app/controller/UserController.php