fix
Merge branch 'master' of github.com:cArLiiToX/dtstore

Conflicts:
	var/log/system.log