CNS-564: Columns not in-line for Rubrics
CNS-555: Strange behavior when moving assignments on calendar
Merge branch 'develop' of github.com:HotChalk/canvas-lms into develop