user can delete channel from users show and from channel show
Merge branch 'master' into user_delete_channel

Conflicts:
	app/assets/javascripts/application.js
	dump.rdb