Arreglo de la paginacion en asociar
Merge remote-tracking branch 'origin/TerminalsUI1.1' into TerminalsUI1.1

Conflicts:
	controller/main.js