?
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/views/superuser/centers/show.html.haml