fixed VERTICAL reset ship NPE
Merge branch 'alpha' into beta
merged with alpha to fix bug