Merge branch 'master' of github.com:timflapper/cordova-spotify-plugin

Conflicts:
	README.md