Merge branch 'master' of https://github.com/moochry/amazon_nju

Conflicts:
	amazon_wx/grails-app/i18n/messages_zh_CN.properties