Moved contents of openni_wrapper folder one level up
Removed empty openni_wrapper folder
Changed OpenNI2 submodule path