Update ruby version for circle builds
fixes #5585
Fix Asset position for different viewables.
fixes #5590
Test latest 2.1.5

Conflicts:
	.travis.yml

Conflicts:
	.travis.yml
Give spec correct title.

fixes #5614
set the order#payment_state to the correct state when order is canceled

Fixes #5278
Closes #5279
Closes #5388

return the new payment state in the update_payment_state, and add some spacing in the spec.

remove the stub to make sure this is not always returning "pending" *doh*

Conflicts:
	core/app/models/spree/order.rb
Fix specs and update syntax.
[backend] Hiding option values handle if object is not persisted

[backend] @option_type.option_values is always set. No need to verify it emptiness

[backend] Hiding the handle of option values if object is not persisted
Bump rails.
Bump version
Bump to beta