Fixed issue with scaling mechanism.
Fixed Css layout for local video.
Add/Remove local video.
Merge remote-tracking branch 'origin/master'