Loading window & different templates for custom url
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/popup.js