Agregando vista detalle de cita.
Merge branch 'master' of https://github.com/GangOfFive/falafel into detalleCita

Conflicts:
	src/main/webapp/resources/js/principal/services/CitasServices.js
	src/main/webapp/resources/sass/app.scss
Agregando confirmacion al enviar correos.
Merge branch 'master' of https://github.com/GangOfFive/falafel into detalleCita
Agregando columnas para impresión.
DRY.
Merge pull request #65 from GangOfFive/detalleCita

Detalle cita
Merge branch 'master' into editarObjetivo