Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/index.html.erb
Merge branch 'master' of github.com:ruby-china/rubyconfchina.org
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/index.html.erb
Adjustment position of bitfund.
Remove speaker: Vincent.
Merge remote-tracking branch 'upstream/master'
Update url of JD
Fix typo
add buy ticket link
Merge pull request #3 from jasl/add_19wu_link

增加购票链接
Merge remote-tracking branch 'rubyconf/master'