* Acl:
Add check to undefined role
Lint to eslint
Missing merge file
Fix lint problems
Change Acl lookup
Change ACL to be more extensible
Fix a few review comments
Acl refactor working
Mostly working, still problems with user subs
Code refactored
* upstream/master:
Improve lint script
Update package-lock with the new packages
Add missing packages and fix formating
Switched from 2 deprecated packages
Corrected findDOMNode import for the poll shape
Switched from the deprecated react-addons-css-transition-group package to a recommended one
Updated react-meteor-data to remove a new React 15 warning
Updated main packages
Switched to prop-types package to remove new React 15 warnings
Improve ESLint rules
Linter auto fix
Change lint import configs to our pattern
Remove autofix script
Replace JSCS in favor of ESLint
* 'master' of https://github.com/bigbluebutton/bigbluebutton:
HTML5 - removed 'lockedLayout' variable
Update README.md
Improved the detection if IP addresses in bbb-conf
Removing event listeners in handleHide
Fixed click listeners' initialization
Bump version number to 1.1.0
Update BigBlueButton.html
remove new lines being rendered in log/development.log
remove new operator
add suggested changes
HTML5 - put the order at media class
HTML5 - removed unused media query
HTML5 - removed unused media query
HTML5 - fixed order and slide control position
change file permission to 644
fix new lint issues
set files permission to 644
Fix client lint issues except those which are comment related
HTML5 - fixed fixed closed-caption display
HTML5 - fixed closed-caption display
