del
del
Merge branch 'b1' of https://github.com/Zuohr/mc.git into b1

Conflicts:
	mc/WebContent/index.html