Usuario conecta en paginas
Merge branch 'vistas' into controllers

Conflicts:
	application/app.js
	application/public/js/client.js