Merge branch 'master' of https://github.com/st-james-software/uct-maths-competition into william16
[UPDATE] Added Re-Send email button to review entry page. Trimmed confirmation email length.
[UPDATE] Added "Entry closing date" logic and applied it to newstudents.html, reviewentry.html.
[UPDATE] Minor fixes and debugging output removed.
[UPDATE] Admin email now resides in compadmin.py (admin is only cc'd on resubmission. Not on "resend confirmation")
[UPDATE] user can reset password via email
Merge branch 'william16' of https://github.com/wyllos/uct-maths-competition into 201312Week3
[UPDATE 2] reset password handled in front end
Merge branch 'master' of https://github.com/st-james-software/uct-maths-competition into william16
Merge branch 'william16' of https://github.com/wyllos/uct-maths-competition into 201312Week3
[UPDATE] Added filters, searchable fields, export capabilities. NOTE: settings.py has changed! Re-enter your database admin details.
[UPDATE] Added filters, export/import option to admin. Removed 'registered_by' field in all entities. Included example csv for school import.
[FIX] Debugged. Removed all traces of registered_by in relavent code.
names are lowercase with 1st letter capital
Merge branch 'william16' of https://github.com/wyllos/uct-maths-competition into 201312Week3

Conflicts:
	uctMaths/competition/views.py
[UPDATE] Export fields for invigilators extended to include responsible teacher details
[UPDATE] Moved functions from view.py to compadmin.py. Added student, school and venue import features. Changed venue fields.
[UPDATE] Final commit for the day. Initial work on allocation algorithm (seems to be working when there are enough venues for students). TO BE IMPROVED.
[UPDATE] Added logic for handling overflow, reporting overflow details (to console). Improved pair logic. Auto-allocation is called on 'Submit' form.
[FIX] Auto allocation algorithm now works with a grade and paired-venue admin-set values. Auto allocate, deallocate is now used via. Venues admin drop down menu and can work on specific venues.