image resizing and pagination fixes
Merge branch 'master' into sachit-imgresizingPagFix
Merge branch 'master' into shrey-reviewFinal1