#861 Changed logic of converting an uploaded image to thumbnail and picture resize / crop
Merge branch 'dev-1.7.0-api-upgrade' of github.com:devbridge/BetterCMS into dev-1.7.0-api-upgrade