[issue #1: Adding s3 support to production]
Merge branch 'issue-1'

Conflicts:
	Gemfile
Adding Gemfile.lock
[Issue #1: Adding config to S3]
Merge branch 'issue-1'

Conflicts:
	config/environments/production.rb
[Issue #1: Adding config to paperclip
Merge branch 'issue-1'
[Issue #1: Adding paperclip configuration to image_decorator]
Merge branch 'issue-1'
[Issue #1: Changing config access s3]
Merge branch 'issue-1'
[Issue #1: Adding config to paperclip]
Merge branch 'issue-1'
[Issue #1: Adding config s3 to spree]
Merge branch 'issue-1'

Conflicts:
	config/initializers/spree.rb