last column should not  hide
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	src/mmGrid.js
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'
Merge branch 'dev'
modify url