Merge branch 'master' of https://github.com/pse-group2/medminersolr

Conflicts:
	lib/tasks/update_wiki/Downloader.rb