Partial work on SyncModule
Merged with master
UserActivities added
Merged with master