Removed NBDataOutputStream again -> see alcros-dev
Merge remote-tracking branch 'origin/master'