new rigth panel
Merge branch 'rigth_panel' into develop

Conflicts:
	app/assets/javascripts/pusher.js