temp
Merge branch 'master' of github.com:DHLeipzig-CurrentTopics-SS2014/shakespeare_project

Conflicts:
	src/django_test/corpora/views.py