Merge remote-tracking branch 'local/cm-10.2'
fix tests and samples
Fix compile errors in tests
GsonSerializer: Fix bug where output stream was not flushed.
DiskLruCacheStore: complete implementation, add basic tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	ion-test/src/com/koushikdutta/ion/test/HttpTests.java
	ion-test/src/com/koushikdutta/ion/test/Issue74.java
	ion-test/src/com/koushikdutta/ion/test/RedirectTests.java