Merge remote-tracking branch 'or/master'

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

DO NOT MERGE WITH THIS
Merge remote-tracking branch 'origin/master'

Conflicts:
	pages/management/commands/all_imports.py
Merge remote-tracking branch 'or/master'
- Fixed all imports

- Added a fixture.

USAGE-
1. delete database
2. m migrate
3. m loaddata pages\fixtures\initial_data.json

Should work - WITHOUT all_imports.
This is assuming all the pics and maps are in DESTINATION -
redspecies\pics\picsA, B, static_maps
Merge remote-tracking branch 'gal_origin/master'