Image Resizing Fixed
Merge origin/development into development