Merge branch 'devel' of http://10.200.0.3/GIT/videosite into devel