template for NormalFile added
Merge remote-tracking branch 'origin/stoewer' into morph-develop
short fix with DimensionFile
Merge remote-tracking branch 'origin/morph-develop' into stoewer
Some small bugs fixed