gamemap grid
fixed merge conflict
Merge branch 'master' of github.com:tlein/GameJam2013
level state modify listeners
Merge branch 'master' of github.com:tlein/GameJam2013