add s3 config
Merge branch 'master' of github.com:Maxim-Filimonov/master_painter
Merge branch 'master' of github.com:Maxim-Filimonov/master_painter
Merge branch 'master' of github.com:Maxim-Filimonov/master_painter
Update to spree 1.3.2
Update spree editor to version compatible with 1.3.2
Update to latest spree 1.3 stable radar repo
Load s3 values from heroku env
Merge branch 'master' of ../master_painter_private

Conflicts:
	config/initializers/spree.rb
Switch to ruby version