Merge branch 'vistas'
Merge branch 'vistas'
Merge branch 'vistas'
Merge branch 'controllers'
Add io file
Merge branch 'controllers'

Conflicts:
	application/io.js
Merge branch 'vistas'

Conflicts:
	application/io.js
Merge branch 'vistas'
Merge branch 'vistas'
Merge branch 'controllers'
Merge branch 'vistas'
Merge branch 'master' of https://github.com/zacr0/aplicacion-proyecto_integrado
Merge branch 'vistas'
Merge branch 'master' of https://github.com/zacr0/aplicacion-proyecto_integrado
Optimizacion: fontawesome local, bootstrap reducido
Arregla fallo en la vista en registro usuario existente
Mejoras en codigo cliente pagina registro
Optimizacion, optimizacion
Optimizacion: socket.io en CDN
Optimizacion: javascript combinado