Merge branch 'master' of github.com:Woems/Greasemonkey

Conflicts:
	config.xml