Merge branch 'release/1.0' into develop
gemfiling
modifiying databse.yml
gemfiling
upgrading to rails 4.1 and spree 2.3
gemfiling
the schema
gemfiling
Merge branch 'release/1.1-heroku'