new commit on testbrach
Merge branch 'testbrach'

Conflicts:
	TwitterPersistence/src/citlab/test/Test.java

zuammenführung?
Merge branch 'master' of https://github.com/tomasmi/tomasmitest