eliminoprueba
Merge branch 'master' of https://github.com/juliansanchez/SM2014Redsocial