Merge branch 'master' of git.wowinterface.com:TitanPanel-571

Merge branch 'master' of git.wowinterface.com:TitanPanel-571

# Conflicts:
#	Titan/Titan_Mainline.toc
#	TitanAmmo/TitanAmmo_Classic.toc
#	TitanAmmo/TitanAmmo_Vanilla.toc
#	TitanAmmo/TitanAmmo_Wrath.toc
#	TitanBag/TitanBag_Cata.toc
#	TitanBag/TitanBag_Classic.toc
#	TitanBag/TitanBag_Wrath.toc
#	TitanClassic/TitanClassic_Classic.toc
#	TitanClassic/TitanClassic_Vanilla.toc
#	TitanClassic/TitanClassic_Wrath.toc
#	TitanClock/TitanClock_Cata.toc
#	TitanClock/TitanClock_Classic.toc
#	TitanClock/TitanClock_Wrath.toc
#	TitanGold/TitanGold_Classic.toc
#	TitanGold/TitanGold_Vanilla.toc
#	TitanGold/TitanGold_Wrath.toc
#	TitanLocation/TitanLocation_Classic.toc
#	TitanLocation/TitanLocation_Vanilla.toc
#	TitanLocation/TitanLocation_Wrath.toc
#	TitanLootType/TitanLootType_Classic.toc
#	TitanLootType/TitanLootType_Vanilla.toc
#	TitanLootType/TitanLootType_Wrath.toc
#	TitanPerformance/TitanPerformance_Classic.toc
#	TitanPerformance/TitanPerformance_Vanilla.toc
#	TitanPerformance/TitanPerformance_Wrath.toc
#	TitanRegen/TitanRegen_Cata.toc
#	TitanRegen/TitanRegen_Classic.toc
#	TitanRegen/TitanRegen_Wrath.toc
#	TitanRepair/TitanRepair_Classic.toc
#	TitanRepair/TitanRepair_Vanilla.toc
#	TitanRepair/TitanRepair_Wrath.toc
#	TitanVolume/TitanVolume_Classic.toc
#	TitanVolume/TitanVolume_Vanilla.toc
#	TitanVolume/TitanVolume_Wrath.toc
#	TitanXP/TitanXP_Classic.toc
#	TitanXP/TitanXP_Vanilla.toc
#	TitanXP/TitanXP_Wrath.toc