summary

Se agrego librerias nuevas : ui-utils-event.js y ui-map
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/recintos/recintos.controller.js