Merge branch '96-upload-directory-second-version' into 'dev'

Add new upload dialog with directory upload and without rules/composite tabs

Closes #96

See merge request !79