merge with redcreator
Merge branch 'master' of https://github.com/guotie/mcmp
Merge branch 'master' of https://github.com/guotie/mcmp
Merge branch 'master' of https://github.com/guotie/mcmp

Conflicts:
	templates/activity.html