Added openGL renderer work in progress
Manual merge with master