Merged UI-changes from development

Conflicts:
	Sources/Internal/UI/UIStaticText.cpp
Merged UI-changes from development