format fixes
merge
Merge branch 'AlenaBranch' of https://github.com/govorovsky/EpicGame into HEAD
fix token input