Added genotype to strain page. Fixed (i)s on regulation page.
Updated regulation table columns.
Fixed #2635.
Fixing small bugs.
merging in master; conflict fix.