Merge origin/master

Conflicts:
	src/com/webicex/jumpblocks/heightCommand.java