primer commit
Merge branch 'master' of https://github.com/openjaf/spree_enhanced_relations

Conflicts:
	Gemfile
	spree_enhanced_relations.gemspec