23
Merge branch 'master' of https://github.com/wuhanyu/vpk

Conflicts:
	vpkserver/app/views/weixins/myinfo.xml.erb