Finishes replacement of assertError in favor over assertTemplateUsed("error.html")
Merge branch 'feature/track_activation' of https://github.com/penzance/ab-testing-tool into feature/track_activation

Conflicts:
	ab_testing_tool_app/tests/test_selection_pages.py