Merge remote-tracking branch 'upstream/master'

resolved conflicts with refactored structure

frontend/document/credocument.lua

@@ -20,7 +20,6 @@ local CreDocument = Document:new{
 	fallback_font = "Droid Sans Fallback",
 	default_css = "./data/cr3.css",
 	options = CreOptions,
-	configurable = Configurable,
 }
 
 -- NuPogodi, 20.05.12: inspect the zipfile content
@@ -123,6 +122,10 @@ function CreDocument:close()
 	Document.close(self)
 end
 
+function CreDocument:getPageCount()
+	return self._document:getPages()
+end
+
 function CreDocument:drawCurrentView(target, x, y, rect, pos)
 	tile_bb = Blitbuffer.new(rect.w, rect.h)
 	self._document:drawCurrentPage(tile_bb)