Duplicate names
Marine class alterations
Merge branch 'dev' of github.com:FlansMods/FlansMod into dev