add weixin auth2 get openid
Merge branch 'master' of https://github.com/onesliu/meixincart

Conflicts:
	admin/config.php
	config.php