add grid
update
Merge branch 'master' of github.com:forsigner/ibaokuan

Conflicts:
	js/app.js