Merge branch 'master' into feature/multi_exp_part2.5

Conflicts:
	ab_tool/urls.py
Merge branch 'feature/multi_exp_part2.5' into feature/multi_exp_part3

Conflicts:
	ab_tool/templates/ab_tool/control_panel.html
Merge branch 'feature/multi_exp_part3' into feature/multiple_experiments