user
Merge branch 'master' of https://github.com/RossimulatorUS/Core

Conflicts:
	Core/MyOpenGL.pro.user