no fair alternative for seller
add multiple to queue with same title for #709
changed naming
missing tests
Merge branch 'develop' into feature-no-fair-alternative-config
Merge branch 'master' into develop
text changed
swiched off delayed jobs
should fix test sweet and closes #709
bookbox prepared
solr for #686
Merge branch 'feature-no-fair-alternative-config' into develop
do not show fair alternative for ecobookstore for #709
improved mass_upload solution
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' into feature-wegreen

Conflicts:
	Gemfile