Some changes
Merge remote-tracking branch 'test/master'

Conflicts:
	DataModule.dfm
	logs/log.txt