merged conflicts
made update page sortable too
fixed merge conflict with local copy
Merge branch 'priyaFix'