Merge pull request #5 from Arepo/Developer

Developer
Defunkt commit
I am merging Developer with Master
Merge branch 'master' into Developer
ship placing feature improved
post-Enrique cleaning
Water commit
test
Water
completed
Merge pull request #6 from jbk1/Developer

Cell class competed & request add
moving over to using Cells
Merge pull request #7 from tansaku/Developer

moving over to using Cells
Friday morning work
Post merge-conflict commit
Resolved merge issues
Delayed commit
completed grid reference translation
Added the various classes of battlescooter
Actually added the various classes of battlescooter
Actually added the various classes of battlescooter