Password reset functionality
Somehow we managed to lose the password styling
Merge branch 'master' into passwords

Conflicts:
	static/media/css/core.css
	static/media/less/core.less
Merge branch 'master' into passwords

Conflicts:
	static/media/css/core.css
	static/media/css/core.min.css
Merge branch 'master' into passwords

Conflicts:
	static/media/css/core.css
Merge pull request #321 from andrewhayward/passwords

Password reset