cosmetic change
Merge branch 'develop' into feature/new_interface_integration_part5
Merge branch 'feature/new_interface_integration_part5' into feature/new_interface_integration_part6
adds css directives
Merge branch 'develop' into feature/new_interface_integration_part5
adds comments and reduces some duplication
Merge pull request #82 from penzance/feature/new_interface_integration_part5

Feature/new interface integration part5
Merge branch 'develop' into feature/new_interface_integration_part6
some fixes and optimizations
Merge pull request #83 from penzance/feature/new_interface_integration_part6

Feature/new interface integration part6
Merge pull request #84 from penzance/feature/new_interface_integration_part7

Feature/new interface integration part7
test fixes given code modifications
Merge branch 'feature/new_interface_integration_part6' into develop
Merge branch 'master' into feature/new_interface_integration_part8

Conflicts:
	ab_tool/static/ab_tool/js/experiment.js