page loading via content_script
Merge branch 'tyler'

Conflicts:
	background.js
fixed merge