Merge branch 'develop' of github.com:klggg/klggg into develop
Merge branch 'develop' of github.com:klggg/klggg into develop

Conflicts:
	fwp2p27/admin/Lib/Action/PublicAction.class.php
	fwp2p27/admin/ThinkPHP/Common/runtime.php
	fwp2p27/ebak/index.php
	fwp2p27/index.php
	fwp2p27/system/template/template.php
	fwp2p27/system/utils/es_session.php
	fwp2p27/update/ThinkPHP/Common/runtime.php
Merge branch 'develop' of github.com:klggg/klggg into develop

Conflicts:
	.gitignore
	fwp2p27/admin/Lib/Action/PublicAction.class.php
	fwp2p27/admin/ThinkPHP/Common/runtime.php
	fwp2p27/ebak/index.php
	fwp2p27/index.php
	fwp2p27/system/template/template.php
	fwp2p27/system/utils/es_session.php
	fwp2p27/update/ThinkPHP/Common/runtime.php
Merge branch 'develop' of github.com:klggg/klggg into develop