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

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBView.java