Extra error handling
Fix to deal with updated epub-lib
Updated version numbers
Now uses stable 0.4 version of HtmlSpanner
Extra null check
Check for isAdded()
Disabled image loading here
Merge branch '2.1_bugfix'

Conflicts:
	AndroidManifest.xml
	pom.xml