fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orthodent/src/orthodent/pacientes/Recaudacion.java
Merge branch 'master' of https://github.com/mariytu/Orthodent