Merge branch 'release/1.0'
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
gemfiling
upgrading to rails 4.1 and spree 2.3
gemfiling
the schema
gemfiling
Merge branch 'release/1.1-heroku'
Merge tag '1.1-heroku' into develop

1. fixing lots of bugs
2. moving to postgresql (because of heroku)