Updated Row Height
Removed old Row Height js
fixed merge conflict
Fixed merge conflict

Merge branch 'kelscahill-master'