【重构】删除之前临时引入的不必要的文件
Merge branch 'master' of github.com:striversist/TVGuide

Conflicts:
	src/com/tools/tvguide/activities/SearchActivity.java