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

Conflicts:
	src/django_test/.gitignore
	src/django_test/db.sqlite3
Lösche db.sqlite3