Merge branch 'devel' of ssh://ryoko:22003/home/sun/GIT/videosite into devel