Merge branch 'master' into start-layout-manager-first
Focus issues aes are mostly resolved, but polling is currently not ready for use.
Solved duplicate voting window issue
Fixed frame rate in mpg file
Merge branch 'master' into start-layout-manager-first
 - use connection invoke instead of shared object when sending mouse cursor events in presentation
 - missed a couple of new files
Merge remote branch 'upstream/master'

Conflicts:
	record-and-playback/presentation/playback/presentation/playback.js
change long to string
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into change-internaluserid
Align components in playback.
Syncing local ocal repo
Merge remote branch 'origin/master' into poll-access
Merge branch 'master' into start-layout-manager-first
Do not play video file according to audio file.
 - convert userid from Number to String
 - fix muteémute button
 - fix switch presenter
 - make layoutUrl option full URL
 - change default layout