Merge commit 'de0a24cf66f45388fec6ac1113f209a8a5e9e85d'
Merge branch 'develop'
Merge branch 'master' into INFRA-6-INFRA-99
INFRA-6-INFRA-99

vehicles.txt
- Added Ships
hotfix

animals.txt
- added leopard!
Merge branch 'master' into INFRA-6-INFRA-99
Merge branch 'INFRA-6-INFRA-99'
INFRA-6-INFRA-99

mythical.txt
- added dwarves
Merge branch 'INFRA-6-INFRA-99'
Merge branch 'master' into develop