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