Fixed a couple of things. These had to do with the shield and hyperspacing. Hyperspacing now will appear in random places rather just in the same location if it is safe.
Merge remote-tracking branch 'origin/dev' into dev