starting work on jquery converstion
login page working in jquery, still need to fix toggle visibility for prototype, and call in checklist
login page working now prototype ujs and jquery
jquery/prototype ujs session check, setter for current_student_id
jquery up to students-index
missing quotes, js error
Merge branch 'master' into jquery
more work on jquery and students page
spell check working again in jquery and prototype
working on jquery for team notes
Merge branch 'master' into jquery
working on jquery links and attachments
Merge branch 'master' into jquery

Conflicts:
	Gemfile.lock
	app/views/spell_check/check_spelling.html.erb
	config/application.rb
Merge branch 'master' into jquery
Merge branch 'master' into jquery
move jquery branch to ruby 1.9.3
Merge branch 'jquery' into jquery_pipeline

Conflicts:
	Gemfile.lock
	app/controllers/student_searches_controller.rb
	app/controllers/students_controller.rb
	app/helpers/application_helper.rb
	app/helpers/checklists_helper.rb
	app/helpers/flags_helper.rb
	app/views/layouts/application.html.erb
	app/views/principal_overrides/_new.html.erb
move jquery js to use asset pipeline
Merge branch 'asset_pipeline' into jquery
Merge branch 'asset_pipeline' into jquery