Shockwave, Psystems, View controller over Ogre View, Combo system
Merge pull request #35 from RynsArgent/master

Shockwave, Psystems, View controller over Ogre View, Combo system