introduced ExtensionElement
Merge branch 'master' into intro

Conflicts:
	src/org/geometerplus/zlibrary/text/view/BookElement.java
repackaging
Merge branch 'master' into intro

Conflicts:
	src/org/geometerplus/fbreader/fbreader/BookElement.java
compilation issues
Merge branch 'master' into intro

Conflicts:
	src/org/geometerplus/fbreader/fbreader/BookElement.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into intro-ics