removed duplicate files
Merge branch 'master' into nook
code simplification
Merge branch 'master' into nook
VERSION => 2.2 beta 7
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml