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

Conflicts:
	AndroidManifest.xml