持续集成配置-by jarrick
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/partials/analysis.html