Sprint Progress.
Resolving merge conflicts.
Merge branch 'rails-31' of https://github.com/rkgordon3/radar into rails-31
Final Sprint Progress (close).
Merge branch 'rails-31' of https://github.com/rkgordon3/radar into rails-31