- 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'
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Conflicts:
	README
change color picker for whiteboard
Merge branch 'master' of github.com:blindsidenetworks/bigbluebutton
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
 - change logging history from 30 days to 5 days...don't need that much history
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
Merge branch 'master' into upgrade-to-red5-r4573