mail
Merge branch 'master' of https://github.com/Grupo-UPE/Laboratorio

Conflicts:
	app.js
	public/js/app/controllers.js
Mail
mail
Mail y postu
Merge branch 'master' of https://github.com/Grupo-UPE/Laboratorio