add proprietar imobil view
fix conflicts