Merge branch 'i18n'
Configured for deployment to Heroku
[Assets]
[issue #1: Fixing spree_i18n gem]
Merge branch 'issue-1'

Conflicts:
	Gemfile.lock
[New Style for spree and solving i18n]
[Issue #1: redesigning load_csv]
Merge branch 'issue-1'
Merge branch 'style'

Conflicts:
	db/schema.rb
Merge branch 'deploy'

Conflicts:
	Gemfile
	Gemfile.lock
Adding assets
[config-asset: Setting assets compile to true]
Merge branch 'config-asset'