Merge branch 'master' of https://github.com/aperdria/utp

Conflicts:
	manager_cursus.cpp