MERGING origin master changes to branch
fix incorrect asset loading with change in application.rb; reference for change: http://stackoverflow.com/questions/6005361/sass-import-error-in-rails-3-app-file-to-import-not-found-or-unreadable-comp
specify to fall back to old encryption standard for authlogic upgrade
possible different syntax for wrap_parameters from Rails 3.0 to 3.1 upgrade notes
disable mass assignment protection, probably don't want to add this
update Gemfile, upgrade jquery datables and authlogic, plus others.  App LOADS at this point