Upgrade to Rails 3.2.10
Bye bye libv8... we hate you =)
Added tracking to teaches (fix #30)
Upgrade to Rails 3.2.11 and Devise 2.2.0
Merge ../x0y0

Conflicts:
	Gemfile
	Gemfile.lock
Add teach tracking download in CSV... #30
Added turbolinks track to styles and scripts...
Merge ../x0y0

Conflicts:
	app/views/layouts/application.html.erb
Updated to rails 3.2.11 and added existing users to institution as a janitor...
Merge branch 'master' of https://github.com/francocatena/libreduca
Fixing conflics..

Conflicts:
	app/controllers/application_controller.rb
Merge branches 'master' and 'improving-user-experience' into improving-user-experience
Uncomment some code in application controller =)
Addes images to news and carousel modal
Added user interface for groups.
Added endless pagination to users index...
Merge ../x0y0

Conflicts:
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/assets/javascripts/common.js.coffee
	app/assets/javascripts/mobile.js.coffee
	app/views/users/index.html.erb
	test/integration/users_test.rb
Changed enrollments to be polymorphic.
moving to new coffeescript methods..
Merge branch 'master' of https://github.com/francocatena/libreduca

Conflicts:
	app/controllers/application_controller.rb
Merge branches 'master' and 'improving-user-experience' into improving-user-experience