Fixed conflicts; merging
Trying to undo merge.
Merge branch 'poll-access' of github.com:capilkey/bigbluebutton into poll-access
Trying to commit workable (but in no way accessible) Polling Module)
Merge branch 'poll-access' into merge-master-into-polling-module

Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml