[FIX] reverted password reset url to django 1.5 style
[FIX] fixed a minor bug with password reset

Incompatibility issues between django 1.6 and 1.5 addressed
Merge branch 'testPhase2' of https://github.com/wyllos/uct-maths-competition into 01-2014-FinalBetaTesting