Added Planet.generateShips method
Added performCapture method
Merge branch 'master' into Planet-update
Merge branch 'master' into Planet-update