Using right redirects for 5 downloads
Merge remote-tracking branch 'origin/develop'

Conflicts:
	omero/themes/globalomerotoc.html
Merge pull request #671 from hflynn/rebased/develop/downloads_5

Using right redirects for 5 downloads (rebased onto develop)