added android-filechooser library
Merge branch 'fc2' into fc2-ics
SDK 7 compatibility (no method String.isEmpty())
Merge branch 'master' into fc2
Merge branch 'ice-cream-sandwich' into fc2-ics
manifest declarations
Merge branch 'fc2' into fc2-ics
manifest declarations

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'fc2' into fc2-ics

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'fc2-ics' into filechooser

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
code formatting
cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into filechooser
formatting
unused map
imports cleanup
imports cleanup
Merge branch 'ice-cream-sandwich' into filechooser

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
imports cleanup