Fix password reset for django 1.6
Merge branch 'develop' of github.com:marbindrakon/eve-wspace into develop