First draft to boundary collision

First draft to boundary collisions
Merge branch 'master' of https://github.com/besse/TeamPlay

Conflicts:
	src/main/java/com/teamplay/data/Level.java