Corrected simple typo
Merge pull request #50 from Rubinous/re_submit_to_service_feature

New feature: enables assistants and teachers to re-submit old submissions
Merge pull request #53 from Rubinous/results_view_improvement

Improved the database query of results-view and the data structures of r...
Merge commit '5401b94573a34703e9c2fdb9f841bf9e46dfb455'
LearningObjectCategory model changes. No south yet.
Made models with JSONField south migrateable by adding introspection rules for JSONField according to these instructions: http://south.readthedocs.org/en/latest/tutorial/part4.html#keyword-arguments. Then enabled south for the exercise app with the convert_to_south command.
Merge branch 'master' into LearningObjectCategory
migrations for LearningObjectCategory model and category field in LearningObject model
safety commit
Minor UI improvements
New ExerciseWithAttachement exercise type. This exercise type has
locally stored exercise instructions and a static file which will
be submitted to the grader with user's other files. MultipartPostHandler
is updated to version which can handle binary files better but there
are still issues with Python 2.7.
Allow own form with ExerciseWithAttachment.
If the files to be submitted are not defined, the instructions
can contain own submission form but the attachment is still
attached to POST request before sending it to the grader.
Fixed URL encoding
This bug fixs allows to submit binary files using POST with Python 2.7.
Changed to semantics of the order of the exercises in the course module. The table is ordered by the order of the exercises and the categories don't have orders anymore. Also implemented the rendering of the categories to the template. Also restricted categories of same course_instance to not being able to have same name. The South migration will be in the next commit.
Removed order from admin and updated the migrations.
Numbers back to the course module table.
Merge pull request #55 from Rubinous/master

Enabled South for JSONField and converted exercise app to use South
Made the buttons also respect the order field of LearningObject instead of loop counter.
Added the migration file for ExerciseWithAttachement
Merge pull request #56 from ttsirkia/master

Exercise type which has an attachment
CAUTION! This commit has a schemamigration!