Sistema de usuario terminado
Merge branch 'master' of https://github.com/xpander54/thermomix.mx

Conflicts:
	app/View/Appointments/index.ctp
para sincronizar