removing file upload plugin
committing changes
Merge remote-tracking branch 'origin/develop' into develop