Einige Makefile Anpassungen fuers linken zum Flexi. Fortan Modules werden
bei make install nach local/include kopiert.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/Makefile.am
Unused variables deletet
Merge remote-tracking branch 'thomas/develop'