Sync completed item to server
Merge branch 'master' into feature/sync-complete-item
sync edited items to server
Minor text changes, added longer timeout for sync test
Merge branch 'feature/sync-edit-item'