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