changes for JML/FSTModel @ FIDE
MetaConstructor revised
Merge remote-tracking branch 'upstream/master'

Conflict in fstcomp/composer/FSTGenComposerExtension.java has been fixed by hand.
fix remaining type error of last refactor
extracted getFeaturesFromEquationFile and parseFeatures methods in composer.FileLoader