Fix conflics
Merge branch 'iadd-polling' of github.com:dainv91/bigbluebutton into iadd-polling