small change
Merge branch 'master' of https://github.com/Helium3/cryolite

Conflicts:
	src/cryolite/io/ProgressOutputStream.java
Merge branch 'master' of https://github.com/Helium3/cryolite
Merge branch 'master' of https://github.com/Helium3/cryolite
add readLong