Merge migrations, update synergy branch to develop
Fix flake8 errors
Fix incorrect import
Merge pull request #1045 from quamilek/synergy-sync

Merge migrations, update synergy branch to develop