update 04
Merge branch 'master' of https://github.com/chenbin92/calixV6

Conflicts:
	htmls/css/style.css
	htmls/i/go-edit.png
	htmls/i/go-leave.png