copies changes from shared.rb made since branches have split
lots of "Unstaged changes" in controllers, helpers and models