image comp and resize
Merge remote-tracking branch 'jasmine/master'