formatting
alphabetical order
Merge branch 'master' into nook
version number => 1.10.1
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml