Moved defines to XboxController.h
Merge branch 'develop' of https://github.com/haroniti/NinjaCoders125 into develop