完成grid toolbar开发

完成grid toolbar开发
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/app/example/example.js
	lib/main.js
toolbar commit