Medico
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/ortoxela.csproj