test1
Merge branch 'origin/functionA'

Conflicts:
	batch/grid.html
fix bug
Merge branch 'origin/master'
1