修改了头像显示部分
Merge branch 'master' of https://github.com/Aha-zcj/Baby-show

Conflicts:
	BabyShow/bin/BabyShow.apk
	BabyShow/bin/R.txt
	BabyShow/bin/classes.dex
	BabyShow/bin/classes/com/actionbarsherlock/R$id.class
	BabyShow/bin/classes/com/babyshow/R$drawable.class
	BabyShow/bin/classes/com/babyshow/R$id.class
	BabyShow/bin/classes/com/babyshow/R$integer.class
	BabyShow/bin/classes/com/babyshow/R$layout.class
	BabyShow/bin/classes/com/babyshow/R$menu.class
	BabyShow/bin/classes/com/babyshow/R$string.class
	BabyShow/bin/classes/com/babyshow/R$style.class
	BabyShow/bin/classes/com/babyshow/R$styleable.class
	BabyShow/bin/jarlist.cache
	BabyShow/bin/resources.ap_
	BabyShow/gen/com/actionbarsherlock/R.java
	BabyShow/gen/com/babyshow/R.java
	BabyShow/res/values/styles.xml
	actionbarsherlock/bin/actionbarsherlock.jar