Version 1.17
Version 1.17
Merge remote-tracking branch 'origin/VERSION' into VERSION

Conflicts:
	build/classes/com/Main.class
	src/com/Main.java