Changes to stringH
Merge branch 'dev' into dev_NL
Optimization on effect
Merge branch 'dev' into dev_NL
Added RenderList
Powerup added
Merge branch 'dev' into dev_NL
Merge branch 'dev' into dev_LA
Added helper functions, fixed Box2d.lib files
Added some functionallity to SpaceMan
Merge branch 'dev' into dev_AO
Ability added
Fixed Box2D, for the last time...
Freezebolt update
Merge branch 'dev' into dev_LA
Added a player, sick game is playable
Added string-to-sf::Keyboard::Key conversion
Powerup update and remapping
Merged dev into dev_NL
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/Game.cpp