fix
fix
Merge branch 'master' of https://github.com/lien1992/geek

Conflicts:
	thinksns/thinksns/src/com/thinksns/jkfs/util/MyURLSpan.java