Fix for bug http://sourceforge.net/p/kiwix/bugs/686/
Merge commit 'c57380f31d8256a1d194df3d986244e8b55ff599'

Conflicts:
	android/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java