Summer camp: Update registration link.
Merge branch 'master' of github.com:CalPolyIEEE/ieee
Summer camp: Update the link.
Changed global var IEEE to ieee
Remove csrf token injection in the password_reset form.
Merge pull request #171 from CalPolyIEEE/hotfix-fix-password-reset

Fix CSRF invalidation for the password reset form.
Temporarily remove CSRF protection.
Setup ieee on the base template.
Consoles: Add the console object to admin.
Merge branch 'redo-testing-console'
Fixed internal mode console email
Users: Add ability to modify email in old password reset form.
Emails: Update templates to reset 'info' rather than password.
Merge pull request #172 from CalPolyIEEE/reset-user-email-form

Add ability to modify email in old password reset form.
Users: Update titles for account reset templates.
Merge branch 'master' into make-ieee-var-lowercase

Keeping this branch updated

Conflicts:
	calpoly/static/js/consoles/admin.js
	calpoly/static/js/consoles/posts.js
	calpoly/static/js/consoles/profile.js
	calpoly/static/js/internal_consoles/generate.js
	calpoly/static/js/profilePage.js
Renamed ieee file
Merge branch 'make-ieee-var-lowercase' into voting-framework

Conflicts:
	calpoly/__init__.py
	calpoly/static/js/ModalAlert.js
	calpoly/static/js/editPostsPage.js
	calpoly/static/js/internal_consoles/generate.js
	calpoly/users/views.py