changed settings file
changed back end
changed models
Merge pull request #8 from frank-retief/master

Merge from frank
The form is now prepopulated with previous entries for the specific school.
Number of entries is now restricted
Added a "Remove" button on the invigilators page
 - the invigilator is deleted from the record
Added 'delete student' button for students.html. (and associated functionality)
Added 'save form' nbutton on the newstudents.html form. (and assoc. functionality)
[FIX] Views students&invigilators.html are filtered by school
[UPDATE] Added pair logic ("removing one will remove both")
Merge pull request #9 from frank-retief/201312-W12

201312 w12
[FIX] A few bugs. Added profile blurb about school association
[UPDATE] Auto-populate forms completed.
[UPDATE] Stripped out many of the options available to teachers. Added robustness to school_select page.
made the responsible fields compulsory

laid down basic javascript code for making invigilator fields
compulsory, but not yet working. Responsible teacher fields are working
disabled the page submit button using a checkbox

Changed the title from Administration portal to Registration portal.
Merge branch 'master' into williamo

Conflicts:
	uctMaths/competition/admin.pyc
	uctMaths/competition/forms.pyc
	uctMaths/competition/models.pyc
	uctMaths/competition/views.pyc
	uctMaths/uctMaths/settings.pyc
Merge remote-tracking branch 'upstream/master' into william16

Conflicts:
	uctMaths/competition/interface/newstudents.html
Merge pull request #10 from wyllos/william16

William16
Added student-code. Added new flow (Edit/Submit).
Merge remote-tracking branch 'origin/201312-W12'

Conflicts:
	uctMaths/competition/interface/newstudents.html
	uctMaths/competition/urls.py