Websocket date, startup upload video on start
Merge branch 'master' of github.com:osmman/JEE

Conflicts:
	src/main/java/cz/cvut/fel/jee/ejb/VideoService.java