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

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