added smart scale, not tested
Merge remote-tracking branch 'origin/display' into display
moved resizing,cropiing to worker