сделал лайки
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/views/albom_index.php
	application/modules/id/views/userpage.php
	application/modules/id/views/view_photo.php