all uploads in one place, modal choice popup
Merge branch 'dev' of https://github.com/iamburny/OrmerodWebControl into dev