Fixed ratio cropping
Merge branch 'develop'