Update jna_sh.json

Fixing typo
Update conference.jade
Merge commit 'refs/pull/origin/10'