Merge pull request #3 from zts1993/nightly

Nightly 20140622
Merge remote-tracking branch 'zts1993/beta' into beta
v2.1.0624-beta 发布版本
Merge branch 'nightly' into beta

Conflicts:
	version_config.php
Merge branch 'nightly' into beta

Conflicts:
	version_config.php
v2.3.0625-beta 发布版本
Merge branch 'nightly' into beta
最终修正版本v2.3.0625-beta-final
for greencms
for greencms 2
集成GreenOAuth~beta version
nothing
home addon控制器严重bug