Merge pull request #9 from Daikatana/development

Development
Merge pull request #10 from Lakon/development

Development
Merge pull request #11 from Lakon/development

Development
Major software re-organization. Compiles and runs.

Changed the player/hero to derive from a game character class which in
turn derives from a game object. Created several folders. Created a Gun
class which derives from a weapon class. Several other tweaks to make
this all work.
Merging with the level loading changes.
Fixing up the merge still. THis compiles and runs. But it has a bug.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	Platformer/Platformer/Consumables/Consumable.cs
	Platformer/Platformer/Core/Level.cs
	Platformer/Platformer/Core/PlatformerGame.cs
	Platformer/Platformer/Platformer (Windows).csproj
	Platformer/Platformer/Player.cs
Merge pull request #5 from MikePaNtZ/development

Development merge