清理
Merge branch 'master' of https://github.com/chaojimiaomiao/NearAds

Conflicts:
	src/icy/nearad/TextFactory.java