Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pn/us/hysteria/util/jar/JarInMemory.java
Refactoring