details
Merge branch 'master' of github.com:RhobanProject/Edu

Conflicts:
	sdk/common/commands.xml