added amazon s3 for image upload
merge fix