prep for map walls
Merge branch 'master' of https://github.com/SurrenderMonkeys/sm-gamecraft-2013
add boundaries with collisions
fix merge conflict
fix merge conflict