merging siesna-master
Merge branch 'master' of github.com:FluxAugur/sfi into Siesna-master

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/store/all.js
	app/assets/stylesheets/sfi/styles.css.scss
	app/assets/stylesheets/store/all.css
	app/views/spree/layouts/spree_application.html.erb
	config/initializers/spree.rb
	db/schema.rb
cleaning up merge