Conflicts:
	core/templates/base.html
	core/templates/core/blocks/navigation.haml
	memopol_representatives/templates/memopol_representatives/view.html
	memopol_representatives/views.py