add google stun server
Applying stun server to original demo main.js
Merge remote-tracking branch 'origin/master' into data_channel

Conflicts:
	static/js/main.js