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

Conflicts:
	grails-app/domain/red_social/Usuario.groovy
usuario controller
usuario controller
gsp de login y pagina principal
registro
registro
registro
registro hecho
css
perfil y posteo
Merge remote-tracking branch 'origin/alejox' into matiasw

Conflicts:
	.classpath
	.project
	application.properties
	devDb.h2.db
	devDb.lock.db
	devDb.trace.db
	grails-app/conf/BootStrap.groovy
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/DataSource.groovy
	grails-app/conf/UrlMappings.groovy
	grails-app/conf/red_social/SeguridadFilters.groovy
	grails-app/controllers/red_social/MPostController.groovy
	grails-app/controllers/red_social/UsuarioController.groovy
	grails-app/domain/red_social/MPost.groovy
	grails-app/domain/red_social/Usuario.groovy
	grails-app/i18n/messages_es.properties
	grails-app/views/MPost/nuevo.gsp
	grails-app/views/index.gsp
	grails-app/views/usuario/buscar.gsp
	grails-app/views/usuario/login.gsp
	target-eclipse/.gitignore
	test/unit/red_social/MPostControllerSpec.groovy
	test/unit/red_social/SeguridadFiltersSpec.groovy
	web-app/WEB-INF/tld/c.tld
	web-app/WEB-INF/tld/fmt.tld