Updates:

Changes: mainwindow.cpp -> some fixes
filestream.cpp -> new functions
filestream.h -> new functions
Merge branch 'carsten' into jochen

Conflicts:
	mainwindow.cpp