Merge remote branch 'upstream/master'

...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

...rence/service/presentation/IPresentationRoomListener.java

...ference/service/presentation/PresentationApplication.java

...ference/service/presentation/PresentationEventSender.java

...ton/conference/service/presentation/PresentationRoom.java

...erence/service/presentation/PresentationRoomsManager.java

.../conference/service/presentation/PresentationService.java

...ervice/recorder/presentation/CursorUpdateRecordEvent.java

...vice/recorder/presentation/PresentationEventRecorder.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/locale/ne_NE/bbbResources.properties