added matingEnergyCost to settings
improved
added new settings
Merge remote-tracking branch 'koen/master'
@
@
*
fix for cell stuff