Restantes páginas de eventos
Merge branch 'master' of https://github.com/Dan111/AdCapp-Client

Conflicts:
	app/router.js