Changes for ships and stuff
Merge

Merge branch 'master' of https://github.com/AdmiralPotato/ggj2013

Conflicts:
	Server/Web/Entity.cs
	Server/Web/Ship.cs