fix Issue #105
Merge branch 'master' of https://github.com/libreliodev/android.git

Conflicts:
	src/com/artifex/mupdf/MediaHolder.java