Redphoto
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/controllers/upload.php
	application/modules/id/views/view_photo.php
	application/views/welcome_message.php
	default.css
Понедельник Зиффи
Верстка сообщений
Объединение + Poisk AJAX
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/controllers/albom.php
	application/modules/id/controllers/friends.php
	application/modules/id/controllers/id.php
	application/modules/id/views/chat_friends_form.php
	application/modules/id/views/friends_view_form.php
	application/modules/id/views/left_user.php
	application/modules/id/views/profile.php
	application/modules/id/views/profile_update_form.php
	application/modules/id/views/view_photo.php
online/offline