解决冲突
Merge branch 'master' of https://github.com/shanghaishule/voter.git

Conflicts:
	home/Tpl/default/Public/header.html