Merge commit 'e03d0c66771c4808c0890f3f8c6db0dcbbdb8771'

Conflicts:
	src/main/java/pl/cloud/view/UploadFileView.java
	src/main/java/pl/databases/mongo/UploadFile.java
	src/main/webapp/file_view/index.xhtml