合并代码
Merge branch 'master' of https://github.com/bigtotorouk/mendian.git

Conflicts:
	mdgj/bin/mdgj.apk
	mdgj/bin/resources.ap_