fixes #884
Merge pull request #927 from OCHA-DAP/marianne-dev

fixes #884
#872 - hackish fix - need to ask Marianne of a propper fix
         - seems that jquery.ui.widget.js is not ready when jquery.fileupload.js is initialized
         - removing jquery.ui.widget.js out of the bundle
#905
Merge pull request #930 from OCHA-DAP/dev-dan-sprint22

#905
Merge pull request #931 from OCHA-DAP/dev

Merge DEV to STAGING