测试提交

Change-Id: I03276efc877d43155eceff52a3107971087ae90d
Signed-off-by: lewis <lewisliud@gmail.com>
修改了
修改了
Merge branch 'master' of https://github.com/lewisliud/DreamPHP.git

Conflicts:
	DreamPHP/Library/System/Error.class.php
	DreamPHP/Library/System/Loader.class.php
	DreamPHP/Library/System/Log.class.php