Silly little rubric javascript issue
Merge branch 'rrmercer' into rails4