Fix combo points not disabling
Version 5.3
fade threshold on auras not working
Allow watch frame to be positioned anywhere on screen.
Fix Bonus Loot Frame bouncing around the screen.
Fix gem socket coloring reporting false colors.
Pet Journal skin preventing rarity text from displaying.
Version 5.31
Merge remote-tracking branch 'remotes/ElvUI/master' v5.31

Conflicts:
	ElvUI/ElvUI.toc
	ElvUI/modules/nameplates/nameplates.lua
Fixed merge error.