Implementation of XEP-0071
Fixed header and added necessary NSColor category
Merge branch 'xep-0071'