agergar tramite a partir de gestion
Merge branch 'master' of https://github.com/yowik/gestion

Conflicts:
	application/static/js/script_gestion.js