ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	SOURCE/DataModul.dfm
ok
ok
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	DATABASE/MEAT/OLAP/Fill/FillSoldTable.sql
ok
Merge remote-tracking branch 'origin/master'
ok
Merge remote-tracking branch 'origin/master'