Both controller configs supported
Merge branch 'AlenaBranch' of https://github.com/govorovsky/EpicGame into AlenaBranch