add about
lcm add system paras manage
Merge branch 'master' of 10.168.150.200:~/lnvc2
fix sync problem
a
a
Merge branch 'master' of 10.168.150.200:~/lnvc2

Conflicts:
	.gitignore
Merge branch 'master' of 10.168.150.200:~/lnvc2
Merge branch 'xiaofeng'

Conflicts:
	.gitignore
Merge branch 'master' of 10.168.150.200:~/lnvc2
lvmc install package
Merge commit 'abc13650f37c57851650430a39ff04e13fd7cb2b' into jimmy
add description about json protocol format of whiteboard
Merge branch 'master' of 10.168.150.200:~/lnvc2
fix lvmc package
1)lcm fix get exist conf bug
2)lvmc add check version function
3)lvmc add check conf condition
4)lcm modify xmlrpc config enable transport exception
5)lvmc login get lcm system paras
Merge branch 'master' of 10.168.150.200:~/lnvc2
improve lvmc client update prompt
remove vlcplayer function from lvmc
Merge branch 'master' of 10.168.150.200:~/lnvc2