Fixed bug in mylog.php
Fixed bug in data user display
fixed to make videoconference integration compliant with version 3.X of OpenMeetings
bug fix in database disconnection
fixed define syntax
Fixed bug in videochat.php
fixed bug in videochat.tpl
Merge branch 'upstream/master'

Conflicts:
	comunica/include/videoroom_classes.inc.php
	layout/wisp/templates/comunica/videochat.tpl
	layout/wisp/templates/main/default.tpl
Merge branch 'master'