Renamed compute_erg to compute_result
Merge branch 'master' of https://github.com/DHLeipzig-CurrentTopics-SS2014/shakespeare_project

Conflicts:
	src/django_test/corpora/view/compute_result.py
	src/django_test/wordtracer/urls.py
Merge branch 'master' of https://github.com/DHLeipzig-CurrentTopics-SS2014/shakespeare_project