Added configurable parameter sip.client.rtp-ip in bigbluebutton-sip.properties to be able to talk correctly to an external FreeSWITCH server. If everything runs locally the value of this parameter will be identical to sip.server.host. If you're connecting to an external FreeSWITCH then this parameter's value must be the IP of the BBB box and sip.server.host's value will be that of the external FreeSWITCH server.
Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call.
Fix of the previous commit to remove unnecessary System.out.println
Added the configuration parameter sip.remoteserver.host to bigbluebutton-sip.properties to be able to call a remote SIP FreeSWITCH on a different port than the default 5060
Removed forgotten hardcoding used while testing
Adding branding for webcam preview
update size of camera settings
Merge branch 'master' into external_freeswitch
 - rename config proerpty names so it's more clear on what the properties are for
 - try to figure out why listener doesn't get displayed
Revert "Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call."

This reverts commit a7156aa0a6e10fdb128dc230861f1c8083934912.

Command used: git revert a7156aa0a6e10fdb128dc230861f1c8083934912

Conflicts:

	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
 - remove camera names drop down as it's the same as the camera settings button
Merge branch 'master' into style-presentation-upload-window
Merge branch 'master' into listener-does-not-get-displayed-problem
 - turn off scrollbars