Merge forkedhtc/master

Conflicts:
	js/popup.js