Fixed some tabs.
Added LOWEST A/B/Merit sexual selection options
Merge remote branch 'upstream/master'
Merge Conflict fixes