Merge branch 'master' into record-and-playback-feature

bbb-api-examples/PHP/bbb_api.php

bigbluebutton-client/resources/config.xml.template

bigbluebutton-web/grails-app/conf/BootStrap.groovy

bigbluebutton-web/grails-app/conf/DataSource.groovy

bigbluebutton-web/grails-app/conf/SecurityFilters.groovy

bigbluebutton-web/grails-app/conf/UrlMappings.groovy

...rs/org/bigbluebutton/web/controllers/ApiController.groovy

...s/org/bigbluebutton/web/controllers/AuthController.groovy

...bigbluebutton/web/controllers/ConferenceController.groovy

...s/org/bigbluebutton/web/controllers/JoinController.groovy

...org/bigbluebutton/web/controllers/PortalController.groovy

...ebutton/web/controllers/PublicConferenceController.groovy

...n/web/controllers/PublicScheduledSessionController.groovy

...ebutton/web/controllers/ScheduledSessionController.groovy

...s/org/bigbluebutton/web/controllers/UserController.groovy

...ls-app/domain/org/bigbluebutton/web/domain/Account.groovy

...app/domain/org/bigbluebutton/web/domain/Conference.groovy

...app/domain/org/bigbluebutton/web/domain/Permission.groovy

...rails-app/domain/org/bigbluebutton/web/domain/Role.groovy

...ain/org/bigbluebutton/web/domain/RolePermissionRel.groovy