Integrada Chequeo emial, pass y foto
Merge branch 'master' of https://github.com/kotick/Whisky

Conflicts:
	Whisky-web/web/base.xhtml
	Whisky-web/web/login.xhtml
	Whisky-web/web/teacher/attendance.xhtml