added some classes for dev
fix from rebase
Merge remote-tracking branch 'origin/master' into dan-dev

Conflicts:
	MagnetBoy/MagnetBoy/MagnetBoy/ShieldDude.cs
	MagnetBoy/MagnetBoy/MagnetBoyContent/shieldGuy.xml
	MagnetBoy/MagnetBoy/MagnetBoyContent/shieldGuySheet.png
fixed shielddude stuff