2.04.0:schwarherz:19 some small changes

put in flag changes from Europa Divisia and other graphical changes.

Integrated NBRT+
Merge remote-tracking branch 'upstream/master'