komit
Merge remote-tracking branch 'origin/release-1.0' into release-1.0

Conflicts:
	src/com/Main.java