server configure
Merge branch 'master' of https://github.com/mawei/jinjintuanweb
Merge branch 'master' of https://github.com/mawei/jinjintuanweb
Merge branch 'master' of https://github.com/mawei/jinjintuanweb
Merge branch 'master' of https://github.com/mawei/jinjintuanweb

Conflicts:
	include/configure/system.php