Merge branch 'riadvice-config-options-clean' into v2.0.x-release

bigbluebutton-client/resources/config.xml.template

...luebutton/main/model/modules/BigBlueButtonModuleLoader.as

.../org/bigbluebutton/main/model/modules/ModuleDescriptor.as

...igbluebutton/main/model/options/BrowserVersionsOptions.as

...c/org/bigbluebutton/main/model/options/SkinningOptions.as

...org/bigbluebutton/modules/caption/model/CaptionOptions.as