Merge Rails 3 Updates into main UWDP development branch