avances
Merge branch 'front' of https://github.com/eclass/kiosko into front

Conflicts:
	js/app.js