1/2 Done Better Implemntation of Heraldry GUI

Also started making heraldric items use the icon system, I am unsure how it will go with the icon positioning though.
Improvement of Heraldry GUI
Improvements in Heraldry Rendering
Merge remote-tracking branch 'upstream/master'
Added dagger, OneHanded and TwoHanded weapons