nex version will be 1.10
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
updated script
Merge branch 'master' into ice-cream-sandwich
CANCEL_MENU action
Merge branch 'master' into ice-cream-sandwich
OPEN_PREFERENCES action
Merge branch 'master' into ice-cream-sandwich
code style cleanup
Merge branch 'master' into ice-cream-sandwich
OPEN_BOOKMARKS action
OPEN_NETWORK_CATALOG action (with no data)
Merge branch 'master' into ice-cream-sandwich
unused resource strings
code style cleanup
Merge branch 'master' into ice-cream-sandwich
new resource strings
added missing string
Merge branch 'master' into ice-cream-sandwich
cleanup