edit done
Merge branch 'master' of https://github.com/BernalF/FTMatricula

Conflicts:
	Source/FTMatricula/FTMatricula.csproj