Curso y profesor (ver datos, modificar)
Merge branch 'master' of https://github.com/DeEvo/deevo.git
Revert "Curso y profesor (ver datos, modificar)"

This reverts commit 33dc5f4657e1d74dcf71c71850af4baf5da33a0f.
Revert "Revert "Curso y profesor (ver datos, modificar)""

This reverts commit 4c9cd289740fd2b3949bbbb9f9fa627458258d67.
Merge branch 'master' of https://github.com/DeEvo/deevo.git

Conflicts:
	src/com/deevo/java/client/place/NameTokens.java