Merge remote-tracking branch 'gal_origin/master'

Conflicts:
	pages/management/commands/all_imports.py
	pages/templates/pages/species_detail.html
fixed translation in 'species_detail.html'
NOT working - moving between computers.

DO NOT MERGE WITH THIS