Edit out failing tests, the correct version will be merged soon
Update guava artifact and version
Merge pull request #25 from daisy-consortium/update_guava

Update guava artifact and version
Clean up
Set the proper context to the loca jobs
Make order of options in tests predictable
Add file path to the result element when in local mode
Add getSize to job results
Add atomic result size to the job xml response
Update job xml sample
Merge branch 'local_remote_merge' of github.com:daisy-consortium/pipeline-framework into local_remote_merge

Conflicts:
	webservice-utils/src/main/java/org/daisy/pipeline/webserviceutils/xml/JobXmlWriter.java
	webservice/samples/xml-formats/job.xml