hola
Merge branch 'alejox' of https://github.com/JavaEE2014/red_social into alejox

Conflicts:
	grails-app/domain/red_social/Usuario.groovy