Merge branch 'master' into 2.7BetaStaging

Conflicts:
	Source/gg2/Objects/Menus/Hosting Menu Elements/HostOptionsController.events/Create.xml
	Source/gg2/Objects/Overlays/Gamemodes/_resources.list.xml
	Source/gg2/Objects/Overlays/ScoreTableController.events/Draw.xml
	Source/gg2/Scripts/Maps/basicRoomSetup.gml
	Source/gg2/Sprites/HUDs/Gamemode HUDS/CTF/_resources.list.xml
Merge remote-tracking branch 'wareya/2.7BetaStaging' into 2.7BetaStaging
Merge commit '0e024454a128ad01b231916c2d078a817732c05b' into 2.7BetaStaging

Conflicts:
	Source/gg2/Objects/Collision maps/DebugRoomO.xml
	Source/gg2/Objects/Menus/Hosting Menu Elements/AdvHostOptionsController.xml
	Source/gg2/Objects/Menus/Hosting Menu Elements/HostWarningsController.xml
	Source/gg2/Objects/Menus/Options Menus/EngineOptionsController.events/Create.xml
Merge branch 'master' into 2.7BetaStaging

Conflicts:
	Source/gg2/Objects/Menus/MenuController.events/Draw.xml
	Source/gg2/Objects/Menus/MenuController.events/Step.xml
	Source/gg2/Objects/Menus/Options Menus/EngineOptionsController.events/Create.xml
	Source/gg2/Scripts/Menus/menu_create.gml
Fix effects of merge
Merge branch 'master' into 2.7BetaStaging
Removed Faucet HTTP extension because it's included as a set of scripts anyway
Merge remote-tracking branch 'remotes/ajf/wareya_timer_stuff'

Conflicts:
	Source/gg2/Scripts/Macro/_resources.list.xml
Removed commented-out code
Fixed background downloader being disabled (probably for local testing)
Merge remote-tracking branch 'ajf/wareya_balance' into review-master

Conflicts:
	Source/gg2/Objects/Characters/Engineer.events/Create.xml
	Source/gg2/Objects/Characters/Heavy.events/Create.xml
	Source/gg2/Objects/Characters/Sniper.events/Create.xml
	Source/gg2/Objects/Characters/Soldier.events/Create.xml
	Source/gg2/Objects/InGameElements/Character.events/Create.xml
	Source/gg2/Objects/Weapons/Minigun.events/Begin Step.xml
	Source/gg2/Rooms/Gang Garrison 2.xml
	Source/gg2/Scripts/_resources.list.xml
Merge remote-tracking branch 'ajf/wareya_obvious' into review-master
Merge commit 'aaadb8cf2a7f20dc0b00fd6162e2d4c2b46818ca' into review-master

Conflicts:
	Source/gg2/Objects/Characters/Sniper.events/Create.xml
	Source/gg2/Objects/Characters/Soldier.events/Create.xml
	Source/gg2/Objects/InGameElements/Character.events/Create.xml
	Source/gg2/Objects/Networking/HTTP/HttpClient.xml
	Source/gg2/Scripts/_resources.list.xml
Merge tag 'V2.7b2' into review-master

Conflicts:
	Source/gg2/Constants.xml
	Source/gg2/Global Game Settings.xml
	Source/gg2/Objects/Menus/Options Menus/EngineOptionsController.events/Create.xml
	Source/gg2/Scripts/Macro/draw_generictimer.gml
	Source/gg2/Scripts/game_init.gml
Merge remote-tracking branch 'remotes/ajf/2.7BetaStaging' into review-master

Conflicts:
	Source/gg2/Constants.xml
	Source/gg2/Global Game Settings.xml
Merge commit '4d10b7d8d10c2c90858b7de5b655c0af4ad9434a' into review-master

Conflicts:
	Source/gg2/Constants.xml
	Source/gg2/Global Game Settings.xml
	Source/gg2/Objects/InGameElements/Character.events/Draw.xml
	Source/gg2/Objects/InGameElements/Gibbage/Gib.events/Create.xml
	Source/gg2/Objects/InGameElements/Gibbage/Gib.events/Step.xml
	Source/gg2/Objects/InGameElements/Gibbage/Gib.events/User Event 0.xml
	Source/gg2/Objects/Overlays/Gamemodes/_resources.list.xml
	Source/gg2/Objects/Overlays/ScoreTableController.events/Draw.xml
	Source/gg2/Scripts/Maps/basicRoomSetup.gml
	Source/gg2/Sprites/HUDs/Gamemode HUDS/CTF/_resources.list.xml
Merge branch '2.7BetaStaging' into review-master

Conflicts:
	Source/gg2/Constants.xml
	Source/gg2/Global Game Settings.xml
	Source/gg2/Objects/InGameElements/Character.events/Draw.xml
	Source/gg2/Objects/InGameElements/Gibbage/Gib.events/Create.xml
	Source/gg2/Objects/InGameElements/Gibbage/Gib.events/Step.xml
	Source/gg2/Objects/InGameElements/Gibbage/Gib.events/User Event 0.xml
	Source/gg2/Objects/Menus/Options Menus/EngineOptionsController.events/Create.xml
	Source/gg2/Objects/RateController.xml
	Source/gg2/Scripts/Maps/basicRoomSetup.gml
	Source/gg2/Scripts/game_init.gml
Fixed mismerged duplication
Merge branch 'review-master' into 2.7branch

Conflicts:
	Source/gg2/Constants.xml
	Source/gg2/Global Game Settings.xml
	Source/gg2/Objects/Collision maps/DebugRoomO.xml
	Source/gg2/Objects/Menus/Hosting Menu Elements/AdvHostOptionsController.xml
	Source/gg2/Objects/Menus/Hosting Menu Elements/HostWarningsController.xml
	Source/gg2/Objects/Menus/Main Menu Elements/BackgroundDownloader.events/Create.xml
	Source/gg2/Objects/Menus/MenuController.events/Draw.xml
	Source/gg2/Objects/Menus/Options Menus/EngineOptionsController.events/Create.xml
	Source/gg2/Objects/Overlays/Gamemodes/TeamDeathmatchHUD.xml
	Source/gg2/Scripts/Maps/basicRoomSetup.gml
	Source/gg2/Scripts/Menus/menu_create.gml
	Source/gg2/Scripts/game_init.gml
Bugfixes, testing stuff

- Added a TDM map (beta BG art)
- Fixed terminal velocity affecting direction
- Fixed rockets shooting through teamdoors
- Fixed map from command line arguments not working