update
Merge branch 'master' of https://github.com/Trazyn/SlickGrid-mini
update