grid ui partial
Merge branch 'master' of github.com:munim/hackedGrid

Conflicts:
	client/css/style.css
	client/templates/template-datagrid.html