Resolved merge conflics
Compiled JS
Refactored grid search fields, list and combo
Merge branch 'master' into fix-grid-errors

Conflicts:
	src/w2grid.js
remove comment.
duplicate cell IDs in summary, editChange handles incorrect row for editable checkbox cells