Add todo for maps
Merge branch 'master' into box2d_border
Refactoring physics things for the player and borders