Merge branch 'dev'

Conflicts:
	src/main/java/cz/cvut/fel/jee/beans/VideoUpload.java