conflict
fixed logging for mobile UI
fixed conflicts
Merge branch 'gh-pages' of https://github.com/KaptenJansson/webrtc into gh-pages