ardone: Added opengl video
kard: fixed merging
commit for merge
Merge branch 'master' of https://github.com/ICAD/KARD into develop

Conflicts:
	.DS_Store