Merge branch 'master' into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Update README.rdoc
Refactor id_index for csv-upload (and documentation)
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'master' into develop
Increase test coverage and bring back rss feed through preliminary hack
Fix merge conflicts
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
remove swap file
Fix #726
scopes updated for mass_upload
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop