Moved enum label/globalization classes to the display layer.
Updated settings files.
Merge commit '7a31356b48b2107fd1e2a4cf4016587687673af2'