Agregado frontend category
Agregado blog
Merge remote-tracking branch 'origin/luis'

Conflicts:
	app/views/staticpage/home.html.haml
Merge
estructura 5