#4734: Display recommended sizes for uploaded images.
Resolve merge conflicts.
Merge pull request #5152 from openscholar/4734-image_dimensions

Display recommended sizes for uploaded images.