country edit and update from jqGrid
Merge remote-tracking branch 'origin/master'