reimplements tests
Merge branch 'master' into feature/multi_exp_part2.5

Conflicts:
	ab_tool/urls.py
Merge branch 'feature/mutli_exp_part2' into feature/multi_exp_part2.5
Merge pull request #65 from penzance/feature/multi_exp_part2.5

Feature/multi_exp_part2.5