VERSION => 1.7.4
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
SAX in XMLSerializer
Merge branch 'master' into ice-cream-sandwich
code simplification
Merge branch 'master' into ice-cream-sandwich
code simplification
Merge branch 'master' into ice-cream-sandwich