ticket_328 Multi file upload widget
Merge branch 'develop' into ticket_328
Merge branch 'ticket_327' into ticket_328

Conflicts:
	hypersocket-ui-bootstrap/src/main/resources/webapp/widgets/fileUploadInput.html
ticket_328 buttons aligned
Merge remote-tracking branch 'origin/ticket_328' into develop