clean folder
Merge branch 'master' of https://github.com/baldachin/TempJingyue01.git
添加整合源数据，测试fragment
Merge branch 'master' of https://github.com/baldachin/TempJingyue01

Conflicts:
	.gitignore