NUEVAS INTERFACES DE SINTOMA Y EVENTO
Merge branch 'master' of https://github.com/cynthiaPH/devBus_babyStatus

Conflicts:
	SweetHistory/res/values/strings.xml
menus de agregar elemento y circulos