added fbreader permissions; exported SYNC intents
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'ice-cream-sandwich' into beta-ics
VERSION => 2.0.4
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into beta-ics