список группы
беседы
Merge remote-tracking branch 'remotes/origin/front'

Conflicts:
	module/Zachetka/view/zachetka/profile/student/chat.phtml
	module/Zachetka/view/zachetka/profile/student/group_list.phtml
	public_html/js/script.js
	public_html/js/zsocket.js
Merge remote-tracking branch 'remotes/origin/front'
Merge remote-tracking branch 'remotes/origin/front'

Conflicts:
	module/Zachetka/view/zachetka/profile/student/chat.phtml
	module/Zachetka/view/zachetka/profile/student/group_list.phtml
	public_html/js/script.js
	public_html/js/zsocket.js
Фикс переключения диалогов