add demo for grid system
update readme
Merge branch 'dev'
resolve confic