fix
Merge branch 'master' of git://github.com/intaro/file-uploader-bundle