synchronization with beta branch (code is not compilable at the moment)
code is compilable
Merge branch 'master' into ice-cream-sandwich
plugin launch
Merge branch 'master' into ice-cream-sandwich
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich

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