Merge origin/master

Conflicts:
	lib/jedo.jar