wang
Merge branch 'master' of https://github.com/qdayy/mjc
wang
Merge branch 'master' of https://github.com/qdayy/mjc
Merge branch 'master' of https://github.com/qdayy/mjc

Conflicts:
	Juhe/Home/View/Uc/mydatainfo.html