commit local changes
Merge branch 'master' of https://github.com/yinger090807/TinyWeibo

Conflicts:
	TinyWeiboV0.5doc/src/cn/edu/csu/iteliter/WeiboWriteImage.java