magic
Merge branch 'master' of https://github.com/bigsergey/OpenGL-Qt-Mutlimedia

Conflicts:
	Multimedia/mainwidget.cpp