Added shield ship to spawns
Fixed the wave spawning so the shield ship wave is not every wave
Merge branch 'MikeyBranch' into development