Changed testfiles for quickaddparser
Cleaned repo
Fixed mergeconflicts
Fixed bugs in the Google API and added an import-toolbar
Fixed bug in driveconnect
Merge branch 'develop'