Diverse opdateringer.
More changes and shit...
Merge remote-tracking branch 'origin/master' into Tristan