Bla bdaslkdkjlas
Merge branch 'master' into dev

Conflicts:
	src/main/java/cz/cvut/fel/jee/beans/VideoBean.java
	src/main/java/cz/cvut/fel/jee/beans/VideoColection.java
	src/main/java/cz/cvut/fel/jee/ejb/VideoService.java
	src/main/java/cz/cvut/fel/jee/trash/StartUp.java
	src/main/webapp/WEB-INF/faces-config.xml
	src/main/webapp/error/404.xhtml
	src/main/webapp/resources/components/videoList.xhtml
	src/main/webapp/video.xhtml
Merge
Merge branch 'master' of https://github.com/osmman/JEE into dev

Conflicts:
	src/test/java/cz/cvut/fel/jee/rest/mock/VideoServiceMock.java
logout + populator s rolemi
Merge branch 'dev'