Prevent y-axis from misaligning with bottom controls
Merge pull request #2250 from jomel150/bug-fix/issue#2088

Bug fix/issue#2088
Merge branch 'develop' into develop-all-the-things

Conflicts:
	kalite/facility/forms.py
Merge branch 'release-0.12.0' into develop-all-the-things

Conflicts:
	kalite/control_panel/static/css/control_panel/base.css
	kalite/control_panel/static/js/control_panel/facility_management.js
	kalite/control_panel/templates/control_panel/account_management.html
	kalite/control_panel/templates/control_panel/facility_management.html
	kalite/distributed/templates/distributed/base.html
	kalite/facility/api_views.py
	kalite/facility/templates/facility/facility_user.html
	kalite/facility/tests/form_tests.py
	python-packages/securesync/engine/api_views.py
Merge branch 'develop-all-the-things' into hackathon

Conflicts:
	kalite/distributed/templates/distributed/base.html
	kalite/facility/forms.py
	kalite/facility/tests/form_tests.py