unused option
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Update cs.xml
Merge pull request #171 from Trottel/patch-7

Update cs.xml
Merge branch 'master' of github.com:geometer/FBReaderJ
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics