Merge branch 'master' into paul-transport

Conflicts:
	providers/transport/webrtc/transport.webrtc.js
Merge branch 'paul-transport' of github.com:UWNetworksLab/freedom into paul-transport