admin&user mgmt, part of commodity mgmt
Merge branch 'master' of https://github.com/moochry/amazon_nju

Conflicts:
	amazon_wx/grails-app/controllers/com/amazon/cn/nj/wx/UserController.groovy
	amazon_wx/grails-app/views/user/_form.gsp
	amazon_wx/grails-app/views/user/create.gsp
	amazon_wx/grails-app/views/user/edit.gsp
	amazon_wx/grails-app/views/user/show.gsp
	amazon_wx/src/groovy/com/amazon/cn/nj/wx/Address.groovy