unix style line ends
formatting

Conflicts:

	src/org/amse/ys/zip/NoCompressionDecompressor.java
	src/org/amse/ys/zip/ZipInputStream.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
mobi: blockquote tag support
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics