Merge pull request #4865 from ritzalam/synch-with-v2.0

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala

...in/scala/org/bigbluebutton/common2/domain/Meeting2x.scala

...b/src/main/java/org/bigbluebutton/api/MeetingService.java

.../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java

...src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java

...rc/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as

...button-client/src/org/bigbluebutton/core/model/Meeting.as

...rc/org/bigbluebutton/main/model/options/MeetingOptions.as

...rc/org/bigbluebutton/main/model/users/EnterApiResponse.as

...ent/src/org/bigbluebutton/main/model/users/JoinService.as

...ent/src/org/bigbluebutton/main/model/users/UserService.as

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml

...-client/src/org/bigbluebutton/main/views/MainToolbar.mxml

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

bigbluebutton-web/grails-app/conf/spring/resources.xml