Added support for Xbox Controllers
Merge branch 'input'