external format plugin support
ExternalFormat => ExternalProgramFormat
plugin format => external format
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
Type.EXTERNAL => Type.EXTERNAL_PROGRAM
files renaming
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
	src/org/geometerplus/fbreader/formats/PluginCollection.java
private method renamed
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
renaming
Merge branch 'beta-ics' into betayota

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	src/org/geometerplus/fbreader/formats/PluginCollection.java
Merge branch 'yota2' into betayota