Merge branch 'feature/fileupload'
Merge branch 'master' of https://github.com/linchpinstudios/yii2-filemanager