Merge branch 'yota2' of github.com:geometer/FBReaderJ into yota2
comilation issue
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
fixed resource: % => %%
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
updated resources
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
plugin actions
plugin actions

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into beta

Conflicts:
	ChangeLog
	src/org/geometerplus/android/fbreader/FBReader.java