Revert "Group uploads together (like delete/download)"

This reverts commit ffa8af5734e113f84f0a692c56547be51f8b3d0b.
Fix conflict. Fix package.js
Merge branch 'development'
bump version