Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/stratego/stratego.class
	src/stratego/stratego.java