Merge branch 'master' of arcade into js-scripting Conflicts: GameAPI.BudgetBoy/GameAPI.BudgetBoy.csproj GameAPI/GameAPI.csproj