Merge branch '2-2-stable' of github.com:erp-lsf/spree-sphinx-search into 2-2-stable

Conflicts:
	spree_sphinx_search.gemspec