create txt
edit
delete
Merge branch 'test' of https://github.com/magicboxhan/ZhihuiyaTest into
test

Conflicts:
	201408201631.txt
delete
delete
create txt
Merge branch 'test' of https://github.com/magicboxhan/ZhihuiyaTest into test
update
create
create
update and delete
Detete
create
update wugui
eclipse
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	08201742.txt
delete file
Solr data update for sg and sh
Merge remote-tracking branch 'origin/master'