Merge branch 'master' of git://github.com/anlecon13/imobilia into anlecon13-master

Conflicts:
	src/imobilia/Cliente.java
	src/imobilia/Factura.java
	src/imobilia/Imobilia.java
	src/imobilia/Propiedad.java
	src/imobilia/Servicio.java