set contentMode of image view to UIViewContentModeScaleAspectFit.
Merge remote-tracking branch 'origin/master'