Commit up
Merge branch 'master' of https://github.com/zchen27/Ogre