--
Merge branch 'master' of https://github.com/ISI-Peasy/tomahawk-resolvers after rémi corrections

Conflicts:
	googledrive/googledrive.js
	googledrive/musicManager.js