working on 3.2
merge in asset pipeline
Merge branch 'master' into rails3.2_ruby_1.9.3
merge in jquery and update rails version for security fix
Merge branch 'jquery' into rails3.2_ruby_1.9.3
jquery.ui upgrade has different filenames for effects
Merge branch 'jquery' into rails3.2_ruby_1.9.3
Merge branch 'jquery' into rails3.2_ruby_1.9.3
tests passing, but there are serious holes in any js update or post with mass assignment errors
Merge branch 'jquery' into rails3.2_ruby_1.9.3
Merge branch 'jquery' into rails3.2_ruby_1.9.3

Conflicts:
	spec/models/user_group_assignment_spec.rb
Merge branch 'jquery' into rails3.2_ruby_1.9.3
Merge branch 'jquery' into rails3.2_ruby_1.9.3
Merge branch 'master' into rails3.2_ruby_1.9.3
pdf mimetype included in rails 3.2 by default
force new login when deployed
merge in 3.2 branch and update travis-ci
Merge branch 'master' into 632_sld_enhancements