Merge remote-tracking branch 'origin/master'

Conflicts:
	src/model/Jumper.java
	src/resources/records