Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Titan/Titan_Mainline.toc
#	TitanAmmo/TitanAmmo_Vanilla.toc
#	TitanBag/TitanBag_Mainline.toc
#	TitanBag/TitanBag_Vanilla.toc
#	TitanClassic/TitanClassic_Vanilla.toc
#	TitanClock/TitanClock_Mainline.toc
#	TitanClock/TitanClock_Vanilla.toc
#	TitanGold/TitanGold_Mainline.toc
#	TitanGold/TitanGold_Vanilla.toc
#	TitanLocation/TitanLocation_Mainline.toc
#	TitanLocation/TitanLocation_Vanilla.toc
#	TitanLootType/TitanLootType_Mainline.toc
#	TitanLootType/TitanLootType_Vanilla.toc
#	TitanPerformance/TitanPerformance_Mainline.toc
#	TitanPerformance/TitanPerformance_Vanilla.toc
#	TitanRegen/TitanRegen_Vanilla.toc
#	TitanRepair/TitanRepair_Mainline.toc
#	TitanRepair/TitanRepair_Vanilla.toc
#	TitanVolume/TitanVolume_Mainline.toc
#	TitanVolume/TitanVolume_Vanilla.toc
#	TitanXP/TitanXP_Mainline.toc
#	TitanXP/TitanXP_Vanilla.toc