updated EditBookInfoActivity
unused method
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
multidirs branch has gone
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
fixed service binding
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
entry dulication protection
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics