ultimo 25 de abril
Merge branch 'master' of https://github.com/johnaagudelo/satec

Conflicts:
	profundi_mydb.sql
	soft_satec/view/editar_soliOferta.php
	soft_satec/view/js/views.js