1.9.5.5
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	ChangeLog
refactoring: special options (with values saved in local storage too)
Merge branch 'master' into beta
special storage for color profile name
Merge branch 'master' into beta