счяс
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/views/left_user.php
	application/modules/id/views/view_audio.php