Merge branch 'fixex5' of https://github.com/oshea00/SlickGrid into oshea00-fixex5