fixed order of file loading
Merge remote-tracking branch 'TNG/matthiasWIP' into matthiasWIP