modif
Merge branch 'master' of https://github.com/fabrige/vdp

Conflicts:
	vdp 25-05-2014/vdp/index.html