Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

bigbluebutton-client/.gitignore

bigbluebutton-client/bin/.gitignore

bigbluebutton-client/build.xml

bigbluebutton-client/config/bigbluebutton.nginx

bigbluebutton-client/locale/bg_BG/bbbResources.properties

bigbluebutton-client/locale/bn_BN/bbbResources.properties

bigbluebutton-client/locale/da_DK/bbbResources.properties

bigbluebutton-client/locale/de_DE/bbbResources.properties

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/locale/es_ES/bbbResources.properties

bigbluebutton-client/locale/es_LA/bbbResources.properties

bigbluebutton-client/locale/eu_EU/bbbResources.properties

bigbluebutton-client/locale/fa_IR/bbbResources.properties

bigbluebutton-client/locale/fr_FR/bbbResources.properties

bigbluebutton-client/locale/id_ID/bbbResources.properties

bigbluebutton-client/locale/it_IT/bbbResources.properties

bigbluebutton-client/locale/mn_MN/bbbResources.properties

bigbluebutton-client/locale/nb_NO/bbbResources.properties

bigbluebutton-client/locale/nl_NL/bbbResources.properties

bigbluebutton-client/locale/pl_PL/bbbResources.properties