compilation issue
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
compilation issue
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
Merge branch 'ice-cream-sandwich' into yota2