Merge remote-tracking branch 'origin/canlee'
doc
更新设计文档
asd
Merge remote-tracking branch 'origin/master' into canlee
Merge remote-tracking branch 'origin/monkey'
Merge remote-tracking branch 'origin/wilk'

Conflicts:
	src/com/invindible/facetime/algorithm/VideoMark.java
Merge remote-tracking branch 'origin/monkey'

Conflicts:
	src/com/invindible/facetime/algorithm/LDA.java
	src/com/invindible/facetime/algorithm/MixedMahalnobisDistance.java
	src/com/invindible/facetime/feature/GetPcaLda.java
	src/com/invindible/facetime/feature/testing4forLDA.java
	src/com/invindible/facetime/model/LdaFeatures.java
	src/com/invindible/facetime/ui/FrameManagerMainUI.java
	src/com/invindible/facetime/ui/FrameSignIn.java
	src/com/invindible/facetime/ui/FrameVideo.java
1
Merge remote-tracking branch 'origin/canlee'
123
Merge remote-tracking branch 'origin/master' into canlee
增加了用户满意功能
无情科密
修改dll
Merge remote-tracking branch 'origin/monkey' into wilk
Merge remote-tracking branch 'origin/canlee' into wilk
无情科密3
Merge remote-tracking branch 'origin/monkey' into wilk
11