Merge branch 'riadvice-code-cleanup'

...ault/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as

bigbluebutton-client/src/PresentModule.mxml

...nt/src/org/bigbluebutton/core/events/LockSettingsEvent.as

...ton-client/src/org/bigbluebutton/core/model/users/User.as

...lient/src/org/bigbluebutton/core/model/users/VoiceUser.as

...-client/src/org/bigbluebutton/core/model/users/WebUser.as

...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml

...n-client/src/org/bigbluebutton/main/views/MainCanvas.mxml

.../bigbluebutton/modules/layout/services/MessageReceiver.as

...ebutton/modules/phone/views/components/ToolbarButton.mxml

...luebutton/modules/present/model/PresentationPodManager.as

...ebutton/modules/present/ui/views/UnselectableItemsList.as

...tton/modules/screenshare/managers/ToolbarButtonManager.as

...screenshare/view/components/ScreensharePublishWindow.mxml

...on/modules/screenshare/view/components/ToolbarButton.mxml

...luebutton/modules/videoconf/maps/VideoEventMapDelegate.as

...luebutton/modules/videoconf/views/ToolbarPopupButton.mxml

...ebutton/modules/whiteboard/views/buttons/ClearButton.mxml

...uebutton/modules/whiteboard/views/buttons/UndoButton.mxml