initial commit of branch changes
diff viewer in codemirror looks much nicer
Merge branch 'master' of github.com:bnmnetp/runestone into feature/diff2
New controller creates sqlform for assignment_types

Also removes evil tabs from the file
functional form to add assignment types
Comments for controllers should remdind me what link
Merge branch 'feature/assignmenttypes' into develop
bad language in polish example
Adjustments for the new codemirror
adjustments for new codemirror
change default height of the merge pane
reorder the diffs, stop diffing in ajax with the new look
styling and re-arranging for the new look
Tweaks to new codemirror for grading interface
Merge branch 'feature/diff2' into develop
fix question numbering
update changelog
Merge branch 'release/release-3.1.1'