- implement user joining voice using webrtc
Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master
 - implement flow for user to join vonce conf uwing webrtc
Merge branch 'split-mic-settings-dialog' into merge-polling-with-master
Merge branch 'master' into merge-polling-with-master

Conflicts:
	bigbluebutton-config/bin/bbb-conf
 - start implementing joining voice using flash
 - continue implementing join voice using flash
 - add new commands
 - show elcome message in chat window
 - disable flash calling for webrtc testing
added a chat event listener. Now a simple chat json injected into pubsub will be displayed in the red5 console and will go through the listener "ChatMessageListener.java"
created a WhiteboardEventRedisPublisher. When I draw in the flash client I get a simple json message in the console of the html5 client
 - continue implementing Flash Mic Settings dialog

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
 - reinit mic
 - don't go through echo test again when user has already done it
Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash
Removed debugging information
Better matching for webRTC enabled in config.xml
whiteboad_draw_event message sent and the html5 client handles it. have to modify the channel the message is sent to. in the html5 client performed a check to see if header.name is whiteboard_draw_event and if yes overwrote the channel to bigbluebutton:bridge
substituted some of the hard-coded values with values from the msg object