updated heartbleed notification
adding notification examples to repo
redirect user to settings page if going to edit password but is already logged in
added seletor .use-sort, to prevent o use sort.js on views that dont need [Fix #70318086]
fix conflicts
adjusts
Merge pull request #653 from devton/ch_partners

Added partners into channel, now channel owners can add they partners on the channel page
Merge branch 'master' of https://github.com/catarse/catarse

Conflicts:
	app/assets/stylesheets/catarse_bootstrap/pages/channels/profiles/show.sass
Merge branch 'master' of github.com:badie/catarse into i18n_updates