Updated with production settings
Fixed again the species listing
merged upstream changes
Merge branch 'test'