Rest
merge
Rest model
Adapters
REST first all get
Merge master into tomasdev

Conflicts:
	pom.xml
	src/main/java/cz/cvut/fel/jee/batching/NewsItemProcessor.java
	src/main/java/cz/cvut/fel/jee/batching/NewsItemReader.java
	src/main/java/cz/cvut/fel/jee/ejb/UserService.java
	src/main/java/cz/cvut/fel/jee/ejb/VideoConversionProducerService.java
	src/main/java/cz/cvut/fel/jee/ejb/VideoService.java
	src/main/java/cz/cvut/fel/jee/exceptions/handler/ExceptionHandler.java
	src/main/java/cz/cvut/fel/jee/message/VideoConverterConsumer.java
	src/main/java/cz/cvut/fel/jee/message/VideoMessageWraper.java
	src/main/java/cz/cvut/fel/jee/model/Comment.java
	src/main/java/cz/cvut/fel/jee/model/User.java
	src/main/java/cz/cvut/fel/jee/model/Video.java
	src/main/java/cz/cvut/fel/jee/rest/AbstractResource.java
	src/main/java/cz/cvut/fel/jee/rest/RestApplication.java
	src/main/java/cz/cvut/fel/jee/rest/UserResource.java
	src/main/java/cz/cvut/fel/jee/security/Authenticator.java
	src/main/java/cz/cvut/fel/jee/utils/VideoConverter.java
	src/main/java/cz/cvut/fel/jee/utils/VideoImageGrabber.java
	src/main/resources/META-INF/batch-jobs/newsJob.xml
	src/main/webapp/WEB-INF/ejb-jar.xml
	src/main/webapp/WEB-INF/faces-config.xml
	src/test/java/cz/cvut/fel/jee/utils/VideoImageGrabberTest.java
	src/test/resources/video/output.mp4
User merge
Merge remove newsItemWriter
Merge branch 'master' of github.com:osmman/JEE