using adjusted ActiveMerchant gem
Merge branch 'active_merchant_paymill_integration' into 2-0-stable

Conflicts:
	Gemfile
	Gemfile.lock
	spree_paymill.gemspec
Fixed wrong paths in the css and js files