Refactor logic for saving uploaded files
Add support for uploading images through ajax
Refactor the image behavior
Merge branch 'release/1.6.0' into develop