scaling-images

Bear with me.  :)
Merge pull request #414 from owncloud/scaling-images

scaling-images