redis url set
sidekiq redis ip on production
HOTFIX: add SSL for WeGreen
HOTFIX turn off ssl for rss query - fixes #727
Merge branch 'master' into develop
HOTFIX ssl disable for OpenURI again - hopefully fixes #727 this time
throw away changes from last hotfix. back to square one. #727
Increase test coverage and bring back rss feed through preliminary hack
Fix merge conflicts
HOTFIX once more - ugly temporary hack for rss ssl
fix test suite
Merge branch 'master' into develop

Conflicts:
	app/controllers/toolbox_controller.rb
set asset servers
asset server config test
asset server config test - without ssl
asset server config test3
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' into feature-discount-cleanup