ticket_327 file upload widget
Merge branch 'develop' into ticket_327
ticket_327 progress bar added
ticket_327 alerts removed
Merge branch 'develop' into ticket_327
Merge remote-tracking branch 'origin/ticket_327' into develop