First pass at tokbox video implementation
Concluded merge and fixed scaffold.html conflict