Use OkHttp 1.3.0.
Merge pull request #358 from square/dimitris/faulty-image

Use OkHttp 1.3.0.
Catch OOM.
Merge pull request #359 from square/dimitris/oom

Catch OOM.
Add micro/mini kind support.
Merge pull request #233 from square/dimtris/micro-mini-kind

Add micro/mini kind support.
Ensure lint is quiet for styles, fix handler to be static class.
Merge pull request #361 from square/dimitris/lint-stuff

Ensure lint is quiet for styles, fix handler to be static class.
Merge branch 'master' into disk-cache

Conflicts:
	picasso/src/main/java/com/squareup/picasso/BitmapHunter.java
	picasso/src/main/java/com/squareup/picasso/ContentProviderBitmapHunter.java
	picasso/src/test/java/com/squareup/picasso/BitmapHunterTest.java