update 2.0.0616

Signed-off-by: hebidu <hebiduhebi@126.com>
Merge branch 'master' of git-gurui:gooraye/gurui

Conflicts:
	Application/Common/Conf/config.php