Merge branch 'master' of https://github.com/deploymentbox/symfony2-file-uploader-bundle

Author: webcome