aws s3 image file direct upload module
fix merge conflicts for main.js, pixi_form and user_form partials