add Menu builder
Merge remote-tracking branch 'origin/master'

Conflicts:
	amazon_wx/grails-app/controllers/com/amazon/cn/nj/wx/WeixinController.groovy