Merge pull request #192 from bcipolli/user_logs_syncing

User logs syncing (resubmit)
Merge remote-tracking branch 'upstream/develop' into control_panel