Switched teamId for correct gameplay and ships;
Merge branch 'Developer' of github.com:gametechnology/psi-2013 into Developer