add some comments
 - add some TODO comment
Merge branch 'connect-bbb-apps-html5' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5
add comments
Merge branch 'connect-bbb-apps-html5' of github.com:daronco/bigbluebutton into connect-bbb-apps-html5

Conflicts:
	client/bbb-html5-client/lib/clientproxy.coffee
	client/bbb-html5-client/lib/redispubsub.coffee
Merge remote-tracking branch 'upstream/connect-bbb-apps-html5' into connect-bbb-apps-html5