update to the latest support library
Merge branch 'master' of https://github.com/levelup/Android-BitmapCache

Conflicts:
	library/libs/android-support-v4.jar