Red albom+msg highlight
mEEErge! z1FFy :)
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/controllers/albom.php
	application/modules/id/views/albom_index.php
	application/modules/id/views/chat_friends_form.php
update карты батулины
Merge branch 'origin/master2'
xepbnya
Merge branch 'origin/master2'
Merge branch 'origin/master2'

Conflicts:
	application/views/template.php
Верстка слайдер на главной и Регистрация
комит