asd

asd
bugfixes
Save and load 6 fields from NMMView.
fixed load bug
pushing stuff
Merge branch 'master' into starbranch
Catching nullpointer exception in draw().