Merge remote-tracking branch 'upstream/master'

Conflicts:
	drivers/bookmarklet/json
	drivers/chrome/apps.json
	drivers/firefox-jetpack/data/apps.json
	drivers/firefox/content/apps.json
	drivers/html/apps.json
	drivers/php/apps.json
	share/apps.json