recuperant
Merge branch 'master' of https://github.com/hgener/ComunicatTipificat

Conflicts:
	comunicatsTipificats/index.html
	comunicatsTipificats/negocio/pageConsultaIncidencias.js
	comunicatsTipificats/negocio/pageNuevaIncidencia.js