class renaming
Merge branch 'master' into nook
new background preference (in progress) + tips are back
Merge branch 'master' into nook
PredefinedImages chooser
Merge branch 'master' into nook
version => 2.1
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml
works predefined image selector
Merge branch 'master' into nook
solid color chooser works
obsolete background color preference has gone
Merge branch 'master' into nook
Japanese localisation (by Takahashi Tamotsu)
missing string for Arabic language
obsolete resource line
updated resources
Merge branch 'master' into nook
android 7 compatibility
gray icon & texy for inaccessible folders