Merge branch 'master' into develop
FLOW-12

Added jackelope
FLOW-13

Categorized animals
HOTFIX-1

Added emergency vehicles
Merge branch 'hotfix/HOTFIX-1'
Merge branch 'hotfix/HOTFIX-1' into feature/FLOW-12
Merge branch 'hotfix/HOTFIX-1' into feature/FLOW-13
Merge branch 'master' into feature/FLOW-13
Merge branch 'master' into feature/FLOW-12