Fixed bug where settings weren't inserted into the page (caused by Google Music DOM changes)
Bump to version 0.6.9-dev
(0.6.9-beta) Merge branch 'develop' into beta

Conflicts:
	data/core.js
	package.json
(0.6.9) Merge branch 'beta'

Conflicts:
	data/core.js
	package.json