Se agrega el parse de Json para los eventos
Merge branch 'master' of https://github.com/manarguedas/RememberMe

Conflicts:

BackEndRememberMeApp/build/web/WEB-INF/lib/mysql-connector-java-5.1.23-b
in.jar
BackEndRememberMeApp/nbproject/private/private.xml
HTMl

ss
Merge branch 'master' of https://github.com/manarguedas/RememberMe

Conflicts:

BackEndRememberMeApp/build/web/WEB-INF/lib/mysql-connector-java-5.1.23-b
in.jar
	BackEndRememberMeApp/nbproject/private/private.xml