11
compile pass
Merge branch 'master' of https://github.com/guotie/mcmp

Conflicts:
	activity.go
	admin.go
	api.go
	templates/admin.html