Merge branch 'master' of http://192.168.3.209/zhangshengli/androidgroup into hmq

Conflicts:
	imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

@@ -27,6 +27,7 @@ import java.io.InputStream;
  *
  *
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @since 1.8.2sadfasdfa
  * @since 1.8.2sadfasdfa
+>>>>>>> 60c2ed3dd69f390d535e0e9eefcf05fcfbf21102
  */
  */
 public interface DiskCache {
 public interface DiskCache {
 	/**
 	/**