Fri AM commit, users controller modified, ordrin.rb modified