Pusher user private channel added
Merge branch 'pusher_priv_ch' into develop
Changing status in Add new friends tab added
fixed tabulation
Merge branch 'ch_status_addon' into develop

Conflicts:
	app/assets/javascripts/pusher.js
	app/controllers/rooms_controller.rb