Merge pull request #12 from murphyslaw480/master

Better enemy waves and radial gui bar
Merge pull request #13 from kalgynirae/inputupdate

Add menu commands to InputManager
Merge pull request #15 from murphyslaw480/collision-fix

Fix collision bug.
Merge pull request #18 from murphyslaw480/master

Melee Weapons and Dangerous Enemies
Merge pull request #19 from murphyslaw480/flamethrower

Flamethrower
Add composite ParticleEffects.

The old "ParticleEffect" is now called a ParticleGenerator.
The new "ParticleEffect" is a composite of 1 or more ParticleGenerators.

Instantiate a ParticleGenerator just like a ParticleEffect by passing in a
string that references an entry in ParticleEffects.xml.
If an entry for such an effect exists, it will instantiate an effect
containing all the defined generators.
If no such ParticleEffect exists, it will search for a ParticleGenerator
with the same name, and instantiate a ParticleEffect with only that one
generator (in other words, all the old particle effects now work as a
ParticleEffect wrapped around a single generator).
Merge pull request #24 from murphyslaw480/quick-fixes

Quick fixes
added menu, settings doesn't do anything.
moving game menu functionality into game
add menu and skeleton camera class
Merge pull request #25 from kalgynirae/gamemenu

Gamemenu
Fix Merge error with SCREEN_WIDTH
Fix contentproj merge error
Improve flexibility of particle effect creation

A particle effect is, as before, defined as a collection of one or more
particle generators. However, one may now override individual attributes
of particle generators in their instantiation in a particle effect.

For example, the particle effect xml element:

<ParticleEffectData Name="MyParticleEffect">
	<ParticleGenerator Name="Effect1" StartColor="255,255,0,0"/>
	<ParticleGenerator Name="Effect1" StartColor="255,0,255,0"/>
	<ParticleGenerator Name="Effect1" StartColor="255,0,0,255"/>
</ParticleEffectData>

creates a particle effect consisting of three instances of Effect1, each
with a different start color.
Add generator offsets in ParticleEffects
Improve Unicorn Particle Effect
Improve particle effect loading
improve blackhole and unicorn effects
Further improve particle effects
Merge remote-tracking branch 'kalgynirae/master'