Merge origin/master

Conflicts:
	src/jtask/JTask.java