Fixes
Merge branch 'dev' of github.com:DGCyE/MapaEscolar into dev

Conflicts:
	w_tool_bar.js