sort cards
add recurring payment method for paypal cr:GA
Merge branch 'master' into dev

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/helpers/application_helper.rb
	app/models/user.rb
	app/views/folders/show.html.erb
	config/routes.rb
Added search by tag and fiter alrticles by tag name #76022106, #76022150 CR:GF
add can can gem CR:PSG
Changes styles from subscriptions and plans #76482576 CR:GF
add user_tag model and relation CR:PSG
Added upgrade button on select plan view CR:DM
add filter paypal_recurring_profile_token.
adds payment to the correct subscritpion.
change variable to subscription.
Added edit form to users #76518416 CR:GF
create search action and link tags CR:PSG
remove href for not buisness account and add alert mess CR:DFP
add icon for sort cards
fix sort icon css and add in interests and lastest
Change soryt style and fix sort bug
add advanced search CR: PSG
Merge branch 'master' into dev

Conflicts:
	app/assets/javascripts/application.js
	app/views/articles/_article_summarized.html.erb
	app/views/folders/show.html.erb
	app/views/layouts/_header.html.erb
	config/application.rb
Fix twitter share bug (e.g. if the title has a ' like Don't, the string was cutted in the ')