Plug.dj support added
Merge branch 'plug.dj-connector' of git://github.com/Aeon/Chrome-Last.fm-Scrobbler into plugdj

Conflicts:
	manifest.json
	options.html
Merge branch 'master' of github.com:david-sabata/Chrome-Last.fm-Scrobbler