changed extra fields order in footer: progress -- clock -- battery
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBView.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
yota images
synchronization with yota2 branch
unused import
synchronization with yota2 branch
Merge branch 'ice-cream-sandwich' into beta-ics