FBReaderSpecialEntry => ExtensionEntry
BookElementsHolder (in text view) => BookElementManager (in fbreader.fbreader)
Merge branch 'master' into ice-cream-sandwich