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 branch 'ticket_327' into ticket_328

Conflicts:
	hypersocket-ui-bootstrap/src/main/resources/webapp/widgets/fileUploadInput.html