Improved uplaod and choose functionality
Merge branch 'anton/use_existing' of github.com:edx/edx-platform into anton/use_existing