Clean up logging
Merge branch 'develop'

Conflicts:
	scripts/content.js