Merge branch '269-photo-cropping-broken-2' of...
Merge branch '269-photo-cropping-broken-2' of edugit.org:AlekSIS/Official/AlekSIS into 269-photo-cropping-broken-2
Merge branch '269-photo-cropping-broken-2' of edugit.org:AlekSIS/Official/AlekSIS into 269-photo-cropping-broken-2