- change esl connection
 - monitor connection every second and connect if not connected
 - upgrade esl jar versions
 - use version 3.2 of netty
 - minor formatting changes
 - subscribe to events
 - simplify handling and sending of events
 - modify ESL connect startup so that it will continue to try to register with ESL
Merge branch 'master' into modify-esl-startup
Merge pull request #167 from SenecaCDOT-BigBlueButton/polling-better-gridviews

Polling better gridviews
update upload presentation string
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
 - fix to allo dashes in the externalUserID passed from the API
Merge branch 'master' into modify-esl-startup
 - add option in presentation to open external file uplaod window instead of from within flash
i - making regex a lot loose
cleaned up some of the localisation strings
Merge remote branch 'upstream/master' into fix-the-tooltips
Merge pull request #166 from SenecaCDOT-BigBlueButton/fix-the-tooltips

Fix the tooltips
moderators can have their audio locked again