Merge Deven and Master
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja