Merge branch 'release-1.0'
Merge branch 'release-1.0.1'
Merge branch 'release-2.0.0'
Fix for save changes to favourites
Update to 2.0.1
Merge branch 'hotfix-2.0.1'
Merge branch 'master' into advanced-save