JAR and friend

As the description said ! ^^
Merge remote-tracking branch 'origin/master'

Conflicts:
	Chip/Engine/Drawer.java
	test.jar