Used my new merge branch as a base to fix location ordering instead
Merge pull request #847 from DirectEmployers/sorting-fix

[PD-457] Location sorting fix
Added another missing static file
Merge branch 'merge-without-activation-changes' of github.com:DirectEmployers/MyJobs into merge-without-activation-changes
Base password-reset stuff
Fix failing tests
Merge branch 'merge-without-activation-changes' into fix-failing-tests
Removed print
Merge pull request #850 from DirectEmployers/password-reset

Password reset [PD-312]
Merge pull request #849 from DirectEmployers/fix-failing-tests

Fix failing tests
Merge branch 'merge-without-activation-changes' into selenium