Changes control panel, intervention point creation, and resource selection html to support multiple experiments
Merge branch 'feature/multi_exp_part3' into feature/multiple_experiments
integrates changes from master
Merge branch 'master' into feature/multiple_experiments

Conflicts:
	ab_tool/analytics.py
	ab_tool/exceptions.py
	ab_tool/models.py
	ab_tool/templates/ab_tool/control_panel.html
	ab_tool/urls.py
	ab_tool/views/intervention_point_pages.py
	ab_tool/views/main_pages.py
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
Merge branch 'feature/multiple_experiments' into feature/additional_tests