start paypal integration
rm paypal_adaptive.yml for key security
paypal integration almost finished and tested
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop

Conflicts:
	spec/support/spec_helpers/coverage.rb
Merge branch 'master' into feature-paypal
Merge branch 'master' into feature-paypal
Merge branch 'master' into feature-paypal

Conflicts:
	Gemfile.lock
gemfile.lock fix
Merge branch 'master' into feature-paypal
Merge branch 'master' into feature-paypal
add paypal yml to linked shared files
Merge branch 'feature-shorter-category-list' into feature-paypal
Merge branch 'develop' into feature-paypal

Conflicts:
	Gemfile.lock
	config/environments/production.rb
	config/environments/staging.rb
fix gemfile.lock
Replaced 'x' in news and notices by Font Awesome character
Merge pull request #939 from marcaltmann/notices

Replaced 'x' in news and notices by Font Awesome character

Vielen Dank, Marc
(unfinished) Merge branch 'feature-paypal' into feature-cart

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/articles_controller.rb
	app/controllers/exhibits_controller.rb
	app/controllers/exports_controller.rb
	app/controllers/feedbacks_controller.rb
	app/controllers/transactions_controller.rb
	config/deploy.rb
	config/environments/development.example.rb
	config/routes.rb
	spec/factories/transactions.rb
	spec/features/transactions_spec.rb
	test/support/spec_helpers/coverage.rb
Merge branch 'develop' into feature-cart
Merge branch 'feature-cart' of github.com:fairnopoly/fairnopoly into feature-cart
Merge branch 'feature-cart' of github.com:fairnopoly/fairnopoly into feature-cart