js nuevo correo
Merge branch 'master' of https://github.com/franak/SocialPlaZa

Conflicts:

SocialPlaZa/WebFolder/components/commons/loginform.waComponent/loginform
.html

SocialPlaZa/WebFolder/components/commons/loginform.waComponent/loginform
.js

SocialPlaZa/WebFolder/components/commons/loginform.waComponent/manifest.
json
	SocialPlaZa/WebFolder/main.html