commit branch switch
deflate no longer relies on BinaryStd classes to read and write headers
fixed deflate; correctly reads length of original file and decompressed
Revert "fixed deflate; correctly reads length of original file and decompressed"

This reverts commit 2a25b24e9261ec70df39903eeeb5ce465f15df13.
Merge origin/master

Conflicts:
	src/DCPWrapper/DCPWrapper.java
Merge origin/master