Merge de lo de Javi
Merge branch 'master' of https://github.com/juanmjacobs/gestion2c2013

Conflicts:
	Clinica Frba/Registrar Agenda/FormRegistrarAgenda.Designer.cs