提交项目关联
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollectionScanner/project.properties
本地记账软件初始化
初步完成短信元素切割
Merge remote-tracking branch 'origin/master'