update-20141219
Merge remote-tracking branch 'origin/master'

Conflicts:
	coo-u-vote/src/main/java/com/coo/u/vote/job/TopicHtmlBuildJob.java