add index column
add index column
add index column
add index column
add index column
Merge branch 'dev'

Conflicts:
	src/mmGrid.js
Merge branch 'master' into gh-pages