Improved support for uploading files via REST API
Merge branch 'master' of git.confine-project.eu:confine/controller into local