Fix sync project
Prepare bug fix release v2.1
Merge branch 'development'