checkbox_incidencias
Merge branch 'master' of https://github.com/dgraselli/adgM

Conflicts:
	www/index.html
	www/js/index.js