update ui
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb

Conflicts:
	src/main/java/org/strasa/web/maintenance/view/model/EditUploadedStudies.java
update
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb
update ui