Added file upload to create article page
Fixed merge conflicts