webrtc on index.html and sass watch tweak
fixed merge conflict
Merge branch 'master' into stub-styles

Conflicts:
	LTL/LTL/templates/index.html