Files relevant to the results/marking view (including the sourcecodeglower)
Merge branch 'master' of git://github.com/MarkUsProject/Markus into annotations
Merge conflicts
Fix for adding new annotations
Fix for non-moving annotations/image annotations not going away.
Formatting and such.
Merge branch 'master' of git://github.com/MarkUsProject/Markus into annotations
Removed some async keys. Some conversion of Prototype. Fixed max to be Math.max
Image-related annotation files converted to jQuery/JS. Unglowing text annotations fixed.
Conversion of some Prototype Classes into regular JavaScript prototype classes.
I hate OOP in JavaScript.
Merge branch 'master' of git://github.com/MarkUsProject/Markus into annotations
More conversion to regular JS classes/Prototype code.
Merge pull request #1517 from arkon94/annotations

JS: Results/marking view + annotations
Remove an unused code path

I seem to have forgotten this when doing the encoding upgrade.
Merge pull request #1526 from ferrous26/wat

Remove unused object from sections view
Merge pull request #1528 from ferrous26/oops

Remove an unused code path
Merge pull request #1527 from ferrous26/dce2

Remove workaround for Rails 2.x stuff
Current status with strong_parameters migration

The functional tests are pointing out some difficulties in the
migration. I am going through controllers more thoroughly now.