amend filter and sort request param
Merge remote-tracking branch 'origin/master'

Conflicts:
	xiang/WebContent/app/store/GridStore.js
	xiang/WebContent/app/store/demo/abc/FooStore.js