Merge pull request #34 from PimV/Develop

Develop
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame
Merge pull request #90 from PimV/Develop

Develop
Merge branch 'Develop' of https://github.com/PimV/Bermuda-TheGame into Animation