Work on upload controller
Merge branch 'develop' of github.com:k-int/KBPlus into develop