Fixed auth
Created the sync feature
Merged with master