moved the whiteboard toolbar over the presentation window and only show it when moused over the window
Merge remote branch 'upstream/master' into improve-whiteboard-toolbar
added a check for presenter status
added support through config.xml for multiple user whiteboard control
Merge branch 'master' into merge-master-into-polling-module

Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
Merge branch 'poll-access' into merge-master-into-polling-module

Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
 - display mic settings when joining voice from the js api
Merge branch 'master' into merge-master-into-polling-module
 -disable polling module by default
updating jar in order to not show warning message
update deskshare jar
load jquery from server
fixed my botched playback merge from 3 months ago
Merge pull request #92 from capilkey/fix-playback-merge

fixed my botched playback merge from 3 months ago
 - change red button to gray and add play icon to the webcam start button
Merge branch 'master' into merge-chad-improve-whiteboard-toolbar-pull
Trying to merge in latest master
Trying to start new branch
Prepping for repo move
Testing if repo move worked