bugfixing, integration of plugins
Merge branch 'master' of github.com:Docear/Sync