new bootstrap
Merge branch 'testing-version-004' of github.com:antobinary/bigbluebutton into testing-version-04

Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/client/lib/custom.bootstrap.json