fix remove does not catch nullpointer
增加一个功能列表文档
文档补全
update doc/络威统一通信系统功能（VOVO）.xls
fix bug
Merge branch 'master' of 10.168.150.200:~/lnvc2
fmj.jar used by function that capture head image from camera conflicts with MeetingRecorder's jmf.jar
a
Merge branch 'master' of 10.168.150.200:~/lnvc2
a
lcm register user 1
register user 1
release update
register user 1
Merge branch 'master' of 10.168.150.200:~/lnvc2

Conflicts:
	.gitignore
fix whiteboard tab name 1
Merge commit '64f32200f87ecf49ee5cb299b6e25611bda0cb42' into jimmy
Merge commit 'f3234b2756ec034e4f2a3ecc4ea99685b593cd7f' into jimmy
improve the function that customize the recording area of MeetingRecorder
a