Merge branch 'hotfix/0.2.1'
Change updater URLs to reflect new repository location
Merge branch 'hotfix/0.2.2' into develop