Added additional whitelist sources.
Merge branch 'production'

Conflicts:
	streamer.js