trial 2
not sure what this commit is about
asflksaf
changed a couple of back end features

Added search tools for schools, venues and students. Expanded the back
end address textfield into a textarea
fixed merge conflicts

reverted back changes done to invigilator responibility forms
commited settings.pyc
Included 'paired' flag for students, removed interface options to normal users
merged master fixed conflict.
Merge pull request #7 from wyllos/merge2

Merge2
pulled frankr branch to williamo
Added 'assigned_to' attribute to School as a forreign key to User.
The plan is to assign a school to a single user (TODO: chosen at sign-up).
 - Therefore, a user_name will be associated with a school
 - If you find your school is taken, contact admin.
removed gender option and disabled con. email

Confirmation email has a conflict with with the removal of the gender
field. Dropped the word new from "register new invigilators"
updated the UCT logo to latest version

also start work on a confirmation checkbox
[CHANGES] Lots of things.
Schools are now associated with user names. (One school for a user)
+ Students (registration page) now redirects if no school is associated with profile.
+ A message is shown in a selected school is already associated with another user.
+ Student registration now has SchoolName in title.
Forgot forms.py in last commit. My bad.
[FIX] assigned_to can now be None. New user can now select school with which to be associated (which will update the database entry with their user name).
made some further changes to the submit checkbox
Merge remote-tracking branch 'frankr/201312U' into monday

Conflicts:
	uctMaths/competition/views.py
enabled confirmation email
updated conflicts with upstream/master