Merge branch 'develop' into feature/miscellaneous

Conflicts:
	ab_tool/templates/ab_tool/control_panel.html
Merge branch 'develop' into feature/miscellaneous

Conflicts:
	ab_tool/analytics.py
Merge branch 'feature/miscellaneous' into develop

Conflicts:
	ab_tool/analytics.py