adaptación a engines
adaptando sitebar
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/admin/angular_libreries_controller.js