Merge branch 'master' of https://github.com/catarse/catarse into new_channel_edit
update on channel profile controller to use only bootstrap