initial 3d Application commit

first version working
basic 3D functionality working
Merged Master branch with ThreeD

Conflicts resolved