Merge branch 'origin/master2'
ignore
Merge branch 'origin/master2'

Conflicts:
	application/models/db_module.php
	application/modules/id/controllers/friends.php
	application/modules/id/controllers/id.php
	application/modules/id/views/friends_view_form.php
	application/modules/id/views/userpage.php
	application/modules/id/views/view_photo.php
	core.js
служба поддержки