Merge branch 'master' of https://github.com/spree-girls/spree-theme-market
Temporary changes to specs
Add 'thin' gem
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market into new_form_model

Conflicts:
	Gemfile.lock
Add AWS gem
Update gem file.;lock
Add paperclip config details