2013-8-28
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.wst.common.component
Merge branch 'master' of https://github.com/IdiotAlliance/wechatptf
refactor