Búsqueda y performance
Merge branch 'master' of https://github.com/rbarrera87/ubuntufeed-1

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Guardfile
	README.md
	Rakefile
	app/assets/images/cerrar.png
	app/assets/images/loading.gif
	app/assets/images/rss.png
	app/assets/javascripts/admin.js.coffee
	app/assets/javascripts/application.js.coffee
	app/assets/javascripts/jquery-cookie.js
	app/assets/javascripts/posts.js.coffee
	app/assets/stylesheets/admin.css.scss
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/normalize.css
	app/assets/stylesheets/posts.css.scss
	app/controllers/admin_controller.rb
	app/controllers/application_controller.rb
	app/controllers/blogs_controller.rb
	app/controllers/posts_controller.rb
	app/helpers/admin_helper.rb
	app/helpers/application_helper.rb
	app/helpers/blogs_helper.rb
	app/helpers/posts_helper.rb
	app/mailers/.gitkeep
	app/models/.gitkeep
	app/models/blog.rb
	app/models/encuesta.rb
	app/models/log.rb
	app/models/post.rb
	app/models/stat.rb
	app/views/admin/edit.html.haml
	app/views/admin/encuesta.html.haml
	app/views/admin/index.html.haml
	app/views/admin/logs.html.haml
	app/views/admin/new.html.haml
	app/views/admin/stats.html.haml
	app/views/blogs/_blog.html.haml
	app/views/blogs/_form.html.haml
	app/views/blogs/index.html.haml
	app/views/blogs/new.html.haml
	app/views/kaminari/_first_page.html.haml
	app/views/kaminari/_gap.html.haml
	app/views/kaminari/_last_page.html.haml
	app/views/kaminari/_next_page.html.haml
	app/views/kaminari/_page.html.haml
	app/views/kaminari/_paginator.html.haml
	app/views/kaminari/_prev_page.html.haml
	app/views/layouts/admin.html.haml
	app/views/layouts/application.html.haml
	app/views/layouts/redirect.html.haml
	app/views/posts/_post.html.haml
	app/views/posts/feed.builder
	app/views/posts/index.html.haml
	app/views/posts/populares.html.haml
	app/views/posts/post.html.haml
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/kaminari_config.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/simple_form.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/routes.rb
	db/migrate/20130214205340_create_blogs.rb
	db/migrate/20130214205445_add_attachment_logo_to_blog.rb
	db/migrate/20130214210602_create_posts.rb
	db/migrate/20130222224911_create_stats.rb
	db/migrate/20130319170659_create_encuesta.rb
	db/migrate/20130322175220_create_logs.rb
	db/schema.rb
	db/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	lib/tasks/main.rake
	lib/templates/haml/scaffold/_form.html.haml
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/iphone.png
	public/logo.png
	public/robots.txt
	spec/controllers/admin_controller_spec.rb
	spec/controllers/blogs_controller_spec.rb
	spec/controllers/posts_controller_spec.rb
	spec/factories.rb
	spec/factories/encuesta.rb
	spec/factories/logs.rb
	spec/factories/stats.rb
	spec/models/blog_spec.rb
	spec/models/encuesta_spec.rb
	spec/models/log_spec.rb
	spec/models/post_spec.rb
	spec/models/stat_spec.rb
	spec/requests/admin_requests_spec.rb
	spec/requests/blogs_requests_spec.rb
	spec/requests/posts_requests_spec.rb
	spec/spec_helper.rb
	spec/support/auth_helper.rb
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep