Make code more readable.
Merge branch 'master' of github.com:christopho/solarus
Merge branch 'master' into jumper

Conflicts:
	src/entities/Jumper.cpp
Fix infinite call and obstacle detection of jumpers.