improve log
Merge remote-tracking branch 'origin/master'

Conflicts:
	engine/database.h
	engine/log.h
	engine/subject.cpp