更新
Merge branch 'master' of https://github.com/xuj/baidu_map.git

Conflicts:
	index.php
	source.php