Fix spending energy with a check
shields / generation
mergeMerge branch 'master' of https://github.com/AdmiralPotato/ggj2013

Conflicts:
	Server/Web/Ship.cs
Merge branch 'master' of https://github.com/AdmiralPotato/ggj2013