2
Merge branch 'master' of https://github.com/NickDraw/ndlog

Conflicts:
	common/define.php
	configs/config.inc.php
	configs/db.inc.php