Merge branch 'master' of https://github.com/songzheng741/Q

Conflicts:
	core/message.js