issue
Merge branch 'master' of github.com:ganeshanv/huxley

Conflicts:
	huxley/accounts/forms/registration.py
	huxley/accounts/static/js/accounts/auth.js
	huxley/accounts/static/js/accounts/registration.js
	huxley/accounts/templates/base_auth.html
	huxley/accounts/templates/password-reset-success.html
	huxley/accounts/templates/password-reset.html
	huxley/accounts/templates/registration.html
	huxley/accounts/templates/registration_closed.html
	huxley/accounts/templates/thanks.html
	huxley/advisors/templates/advisor_index.html
	huxley/advisors/views.py
	huxley/chairs/templates/secretariat_index.html
	huxley/core/models.py
	huxley/core/static/js/core/content-manager.js
	huxley/core/static/scss/core/banner.scss
	huxley/core/static/scss/core/base.scss
	huxley/core/static/scss/core/content.scss
	huxley/core/templates/about.html
	huxley/core/templates/base.html
	huxley/core/templates/base_index.html
	huxley/settings/local.py.default
	huxley/settings/main.py