Starting modal
Merge branch 'add/upload-modal' into development