Merge remote-tracking branch 'upstream/master'

Conflicts:
	lettuce/core.py

added summary when running multiple django apps, plugin + new class to handle it