version 27 nov
Merge branch 'master' of github.com:vmonsalve/prope

Conflicts:
	src/corretage/AdminBundle/Entity/Construccion.php
Merge branch 'master' of github.com:vmonsalve/prope

Conflicts:
	src/corretage/AdminBundle/Entity/Construccion.php
	src/corretage/AdminBundle/Entity/Construccion.php~
cambio en construccion