aws s3 image file direct upload module
fix merge conflicts for main.js, pixi_form and user_form partials
v1.2: updated files to use s3_file_field gem instead of s3_direct_upload