Added sort for jqGrid
modified grid style
Fixed gird bugs
Merge branch 'develop' into temp
Merge branch 'temp'