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

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle

Conflicts:
	AndroidManifest.xml
works predefined image selector
works predefined image selector
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2