modify
Merge branch 'master' of https://github.com/adh38/OpenTokRTC

Conflicts:
	app.js
proof of concept (autojoin and nexting)