Conflicts:
	integration/okhttp/build.gradle
	integration/volley/build.gradle

Conflicts:
	library/AndroidManifest.xml
	library/src/com/bumptech/glide/Glide.java
	library/src/com/bumptech/glide/loader/model/UriLoader.java
	library/src/com/bumptech/glide/presenter/target/ImageViewTarget.java
	library/src/com/bumptech/glide/resize/ImageManager.java
	library/src/com/bumptech/glide/resize/load/ImageResizer.java
	library/src/main/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeStrategy.java
	samples/flickr/src/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java
	samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/api/Api.java

to prevent raw type and unchecked warnings, suppress where needed;
mostly to reduce warnings at call sites in clients.

Release some dangling pool resources in finally blocks and reuse local variables instead of getters.

Less declared but not used exceptions.
Less tested but never thrown exceptions.

and fix the errors.

Fixes #104

Fix some comments: - typos, - documented empty blocks, - shortened some {@link}s, - converted some multi-line comments to single-line/javadocs.

Since we also try to reload the image from source,
we may end up reporting first a failure and then
a success which would leave the request in an
undefined state.

Fixes #97. 

Fixes #90

Fixes #95