Merge branch 'master' of https://github.com/eonarheim/Excalibur into dev-erik
Merge branch 'dev-erik' of https://github.com/eonarheim/Excalibur into dev-erik