Hrozne moc balastu
Merge branch 'master' of https://github.com/osmman/JEE

Conflicts:
	src/main/java/cz/cvut/fel/jee/model/Video.java