Hotfix
Merge branch 'master' of github.com:Bluestorm-Team/BlueStormJS