Guardando progreso
Merge branch 'master' into editarObjetivo
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
Finalizar editarObjetivo y eliminarObjetivo
Merge branch 'master' into editarObjetivo
Agregando confirmacion al enviar correos.
Merge branch 'master' of https://github.com/GangOfFive/falafel into detalleCita
Separar controllers
Corregir metodo acorde a estandares
Agregando columnas para impresión.
Arreglar condiciones no necesarias
DRY.
Merge pull request #65 from GangOfFive/detalleCita

Detalle cita
Merge branch 'master' into editarObjetivo
Merge pull request #63 from GangOfFive/editarObjetivo

Editar objetivo
Merge branch 'master' of github.com:GangOfFive/falafel into crearFormula
Casi lista, tengo problemas con unas cosas del front end