Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.

Style changes to comments: increase font size, width. Improved scrolling between spans and discussions.

Remove dogfood and quickedit.

clean up templates that were removed from disk - we need to remove from ...

Fix broken test and don't pass time units as strings but as ints.

Feature/julian/multiple choice tweaks

lms required grace period fields to be in specific order

Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color.

On 32-bit Python, this conversion could overflow, for example, for year 2099.  This conversion won't.

Changed the markup and js for associating spans with discussion threads. Uses the discussion id now.

change timer to calculate relative duration in javascript

When checking types to convert data, don't forget about longs.  32-bit Pythons make longs from values that are ints on 64-bit Pythons.

Conflicts:
	common/djangoapps/util/converters.py

Resolving an LMS sidebar accordion issue in IE7

fix showing less than and greater than in code

We no longer need override_settings, Django has a better one.

Feature/victor/raw static files

- regexp was too complicated, didn't work

- needed for GWT'ed modules that rely on the filename to find dependencies

bug 155