github updater
Merge branch 'updater' into dev