Revert "Sync"

This reverts commit 3802e97c34c63d71757afc8be41d4617d846d50d.
Revert "Revert "Sync""

This reverts commit 3e1d8d027a4d38667606044714aaa0a47e9babe1.
Merge branch 'master' of https://github.com/ane1990/Linneo