hebing
更新一下
Merge remote-tracking branch 'origin/monkey'

Conflicts:
	src/com/invindible/facetime/algorithm/feature/testing4forLDA.java
	src/com/invindible/facetime/ui/MainUI.java
增加导出的配置文件
Merge remote-tracking branch 'origin/master' into monkey
复制回了noObject.jpg