animation
map
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Player.cpp
map
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013
aa
Merge branch 'Jimmy'
map
musik
Changes to WindowManager and map

WindowManager now holds its RenderWindow private,
and rendering to screen is done via a canvas.

Display
lide skit
fix
mapcollider
mapcollider
player collisonbox
Merge branch 'Jimmy'
camera+update in statemanager
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013
player
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Game.cpp