Merge origin/master

Conflicts:
	src/checkers/DeclareJump.java