Added IonDrive value to the EngineType.
Added kayak boat type
Merge branch 'dev' of https://github.com/tirith63/ExampleProjectGit into summit
Resolved conflicts