Deleted useless comment, adapted ShipTabPageController to new implementation
Merge origin/master
Fixed James' selfish, terrible error