200 blubs
feature 200 master 500, make it 400! 

Merge remote-tracking branch 'origin/fuatures'

Conflicts:
	smf_test/src/com/example/smf_test/Blubber.java
oki vielleicht doch nur 350...