Fixed files upload due to changes of loading of javascripts
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev