fixed infoblock
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	view/src/main/java/com/engagepoint/team_a/cmis_manager/FileUploadController.java