Merge branch 'release-0.12.0' into central-develop-merge

Conflicts:
	kalite/caching/__init__.py
	kalite/control_panel/templates/control_panel/facility_management.html
	kalite/distributed/tests/browser_tests/query_tests.py