[05/01/14] 1B025

- Improved pathfindinding
- Fixed collision (final vesion)