commit
add img
Merge branch 'master' of https://github.com/Tomtang2013/changsha3

Conflicts:
	sites/all/themes/changshanews/css/designvote.css
	sites/all/themes/changshanews/templates/designvote/vote_dspw.tpl.php
	sites/all/themes/changshanews/templates/designvote/vote_main.tpl.php
	sites/all/themes/changshanews/templates/designvote/vote_zpzs.tpl.php
push to GIT`