Merge the rails3 branch in preparation for Dashboard 2.0