Bootstrap 2.1.1-wip updates...
Agregado link_to_show faltante...
Mini-fix en fábricas y README
Generadores de test Fabricas/Unit/Functional
Merge pull request #1 from Shelvak/master
Bye PJAX, hello Turbolinks...
Improved routes to avoid alert message display...
Merge branch 'master' of github.com:francocatena/x0y0
Generando ... Modelos y functional_test =)
Merge pull request #3 from Shelvak/generators

Generando ... Modelos y functional_test =)
Updated Rails to 3.2.9 and Bootstrap to 2.2.1
Upgrade to Capybara 2.0 and Bootstrap 2.2.2
Removed .btn class in form (Devise add this)
Upgrade to Rails 3.2.11 and Devise 2.2.0
Added turbolinks track to styles and scripts...
Added endless pagination to users index...
Upgrade to jQuery 1.9...
User integration test fixed again...
Cleanup Rakefile (shame on me...) [ci-skip]
Merge branch 'master' of https://github.com/francocatena/x0y0

Conflicts:
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	test/integration/public_user_interactions_test.rb