Merge pull request #2164 from jpuri/master

#2154
Fix #2168 (doco): add gridOptions doco, including rowHeight
Merge pull request #2180 from PaulL1/2168_doco

Fix #2168 (doco): add gridOptions doco, including rowHeight