Adding internalMeetingID, isPresenter, hasVideoStream, and videoStreamName to the response of getMeetingInfo.
Added "isListener" to the response of "getMeetingInfo". Had to change bbb-apps, bbb-web and bbb-client to generate and detect events when the user starts/stops its audio. The method used in bbb-client to send the externalUserId can still be improved.
Removed the tag <isListener> from getMeetingInfo and added a tag <listenerCount>.
This is a simpler solution that doesn't require matching a voice conference user with a "normal" user.
Added <participantCount> to the reponse of getMeetings.
Added <listenerCount> and <videoCount> to the response of 'getMeetings'.
added enableHandRaise and enableSettingsButton as config.xml options for the Users Window
Merge pull request #238 from SenecaCDOT-BigBlueButton/add-user-window-options

added enableHandRaise and enableSettingsButton as config.xml options for...
the user private chat selector was still using the hardcoded "you" instead of using the localized string of the users module, I just applied the same string here
Merge pull request #240 from mconf/fix-you-chat

Removing the hardcoded "you" from the private chat selector
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into mconf-live-0.4
Merge commit 'audio-video-on-api' into master

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
Merge branch 'audio-video-on-api' into mconf-live0.4

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java