[All assets turned to text]
Merge branch 'uiMerge' of https://github.com/DimaMaltsev/t5p into uiMerge