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
started with address model
merged with develop
started to build form object for user edit with nested address edit
some code style fixes in fastbill_worker and business_transaction_observer
merged with feature-kick-inherited
weiter mit addressauslagerung