primer commit de invitar por email
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/js/register.js