add amazon s3 image storing
Merge remote-tracking branch 'origin' into serena