Rename USERS table fields.

mysql updates below:
ALTER TABLE `USERS` CHANGE `ALLOW_FROM` `ALLOW_FROM` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
CHANGE `FORCED_SAVING_LIMIT` `MAX_FORCED_REC_MINUTES` INT NULL DEFAULT NULL COMMENT 'in minutes',
CHANGE `SESSIONS_PER_CAM` `MAX_MEDIA_SESSIONS_NB` INT NULL DEFAULT NULL ,
CHANGE `LIMIT_FPS` `MAX_VIDEO_FPS` VARCHAR( 5 ) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL ,
CHANGE `NONMOTION_FPS` `MAX_VIDEO_NONMOTION_FPS` VARCHAR( 5 ) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL ,
CHANGE `LIMIT_KBPS` `MAX_MEDIA_SESSION_RATE_KB` INT NULL DEFAULT NULL COMMENT 'kbps',
CHANGE `SESSION_TIME` `MAX_MEDIA_SESSION_MINUTES` INT NULL DEFAULT NULL COMMENT 'in minutes',
CHANGE `SESSION_VOLUME` `MAX_MEDIA_SESSION_VOLUME_MB` INT NULL DEFAULT NULL COMMENT 'in MBytes';
Merge branch 'master' of github.com:avreg/avreg-site
update USERS #2

ALTER TABLE `USERS` CHANGE `ALLOW_FROM` `ALLOW_FROM` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
CHANGE `FORCED_SAVING_LIMIT` `MAX_FORCED_REC_MINUTES` INT NULL DEFAULT NULL COMMENT 'in minutes',
CHANGE `SESSIONS_PER_CAM` `MAX_MEDIA_SESSIONS_NB` INT NULL DEFAULT NULL ,
CHANGE `LIMIT_FPS` `MAX_VIDEO_FPS` VARCHAR( 5 ) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL ,
CHANGE `NONMOTION_FPS` `MAX_VIDEO_NONMOTION_FPS` VARCHAR( 5 ) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL ,
CHANGE `LIMIT_KBPS` `MAX_MEDIA_SESSION_RATE_KB` INT NULL DEFAULT NULL COMMENT 'kbps',
CHANGE `SESSION_TIME` `MAX_MEDIA_SESSION_MINUTES` INT NULL DEFAULT NULL COMMENT 'in minutes',
CHANGE `SESSION_VOLUME` `MAX_MEDIA_SESSION_VOLUME_MB` INT NULL DEFAULT NULL COMMENT 'in MBytes';

или в MAX_MEDIA_SESSIONS_RATE_KB MAX_MEDIA_SESSION_MINUTES
заменил SESSIONS на SESSION

Conflicts:
	admin/user-tune.php
	lib/adb.php
	lib/config.inc.php