Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into add-pointer-record

...button/conference/service/layout/ILayoutRoomListener.java

...uebutton/conference/service/layout/LayoutApplication.java

...igbluebutton/conference/service/layout/LayoutHandler.java

...g/bigbluebutton/conference/service/layout/LayoutRoom.java

...ebutton/conference/service/layout/LayoutRoomsManager.java

...bigbluebutton/conference/service/layout/LayoutSender.java

...igbluebutton/conference/service/layout/LayoutService.java

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

bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml

bigbluebutton-client/build.xml

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/LayoutModule.mxml

bigbluebutton-client/src/conf/layout.xml

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

...lient/src/org/bigbluebutton/common/assets/images/disk.png

...ent/src/org/bigbluebutton/common/assets/images/folder.png

...src/org/bigbluebutton/common/events/ToolbarButtonEvent.as

...src/org/bigbluebutton/main/model/modules/ModuleManager.as

...nt/src/org/bigbluebutton/main/views/LanguageSelector.mxml