shield
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine
picking up shields
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine

Conflicts:
	Game/Game/Collectible.cs
	Game/Game/PlayerControl.cs
	Game/Game/PowerUp.cs
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine