- can not monitor except deskshare
Merge branch 'master' of git://github.com/ritzalam/bigbluebutton
Merge branch 'master' of git://github.com/ritzalam/bigbluebutton
 - fix monitoring for 0.71
Merge remote branch 'bbb/master'
 - updating to latest from bigbluebutton/master
Conflicts:
	README
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Fixed some labels in Chat module, behaviour of ListBox for starting private chat
Small fix
Fixed bug where screen readers could not 'see' status icons in Users window
Merge remote branch 'upstream/master'
changed shortcuthelpwindow auto focus to the datagrid
Ctrl-Shift-? opens glossary window (or closes it if already open)
added third party presentation playback controls (acornmediaplayer)
Trying to sort out focus issues when application starts.
Syncing repo before branching
Fixed permission issue