Cambios adaptacion models
Merge branch 'Angel' of https://github.com/YuriiTonkov/AulaVirtual into Angel

Conflicts:
	.settings/com.appcelerator.titanium.core.prefs
	app/models/Anotacion.js
prefs