Added presentation stuff.
More stuff.
Merge branch 'nik'

Conflicts:
	documents/2014-03-13 Zwischenpraesentation/PubSubHubbub_1.pptx