Fix user links
Add Octokit and fix some bugs
Merge branch 'dev'