Committed in order to switch to branch dev
changed engine.step: you have to give the delta of x and the delta of y.

the collision detection is improved (I hope)
Merge branch 'bas' of github.com:lshoek/realimaze into bas

Conflicts:
	Realimaze/Realimaze.sdf
nothing changed
Merged dev with igcbom. Had no conflicts to solve. Fixed the issue with the ball going under the maze.
improved the engine
Had to commit in order to merge with bas.
Had to commit in order to merge with bas.
Merge branch 'dev' of github.com:lshoek/realimaze into bas

Conflicts:
	Realimaze/Realimaze.sdf
	Realimaze/Realimaze/Engine.cpp