Fix ClassIcons, take 2
Move combo points to player frame
Prep for tag
Merge branch 'master' of github.com:Phanx/oUF_Phanx