FBLibrary launch
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Revert "FBLibrary launch"

This reverts commit f7f423624e20a15cc3b9ef3e7518bfee5ca53d2a.
Merge branch 'ice-cream-sandwich' into fblibrary
Add an intent filter BOOK_INFO for the BookInfo Activity
Merge branch 'master' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'fblibrary' of github.com:geometer/FBReaderJ into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary
Merge branch 'ice-cream-sandwich' into fblibrary

Conflicts:
	AndroidManifest.xml
synchronization with fblibrary branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
formatting
Merge branch 'master' into beta