Merge branch 'beta' of github.com:geometer/FBReaderJ into beta
date in ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	ChangeLog
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics