bandera
Merge remote-tracking branch 'origin' into luis

Conflicts:
	app/views/staticpage/_posts.html.haml
Bandera
logo
Agregada nuevas autorizaciones