qt uv + cursus
Merge branch 'master' of github.com:Tytan/Projet-LO21

Conflicts:
	UTProfiler/UTProfiler.pro.user