Merge branch 'feature/123_add_platidoma_payment_system' into staging

Conflicts:
	Gemfile.lock
	app/views/web/accounts/_form.html.haml
	config/locales/activerecord.yml
	config/routes.rb
	db/schema.rb
	test/factories/sequences.rb
	test/functional/web/admin/orders_controller_test.rb
Merge branch 'feature/123_add_platidoma_payment_system' into staging