online/offline
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/controllers/id.php
	application/modules/id/views/chat_friends_form.php
	application/modules/id/views/friends_view_form.php