Fixed some warnings in various code.
Fixed an issue with a byte redefinition error on some systems.
Merge branch 'master' of https://github.com/rnrobson/game440_01_2014