mise en place de la VOD
   correction du pb de video VOD
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Transition2D3D.js
	displayStrip.js
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Main.js
	displayStrip.js
	rien
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
 taerzh
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
	video qui marche et son 3D qui marche
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	audio3D.js
	showingWindow.js