Merge branch 'voting-framework'

Conflicts:
	calpoly/api/views.py
	calpoly/posts/views.py
	calpoly/templates/base.html
	calpoly/views.py