Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton

...va/org/bigbluebutton/conference/BigBlueButtonService.java

...webconference/voice/freeswitch/FreeswitchApplication.java

bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml

...ton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml

...ton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties

bigbluebutton-client/branding/README

bigbluebutton-client/branding/default/README

bigbluebutton-client/branding/default/build.xml

...uebutton-client/branding/default/style/css/BBBDefault.css

...randing/default/style/css/assets/images/3_closeButton.png

...ding/default/style/css/assets/images/3_decreaseButton.png

...ding/default/style/css/assets/images/3_increaseButton.png

...ding/default/style/css/assets/images/3_minimizeButton.png

...lient/branding/default/style/css/assets/images/delete.png

...ient/branding/default/style/css/assets/images/ellipse.png

...randing/default/style/css/assets/images/fit-to-screen.png

...branding/default/style/css/assets/images/fit-to-width.png

...-client/branding/default/style/css/assets/images/hand.png

...randing/default/style/css/assets/images/icons-license.txt

...t/branding/default/style/css/assets/images/left-arrow.png