Поигралась с js
Merge branch 'master' of https://github.com/Workspaceforeus/socnet

Conflicts:
	app/controller/CommentController.php
	app/view/user/profile.php
	css/indstyle.css