Attempt to fix the color problem for Player
Merge branch 'develop' of http://github.com/abdullahfahad/project-elite-local into develop