improve multiple upload
fix travis tests
fix travis tests
Remove folder & upload modal, implements same functions inline
server bugfixes
translations
Merge PR#124

Conflicts everywhere. Need extensive testing.
Not built to avoid more conflicts
Merge PR#123 (unbuild)
build post merge
bugfixes post-merge
add missing translations & fix comments on #126
built
various misc fixes on public side
various misc fixes
built