possible fix for NPE in 1.9.5
Merge branch 'master' into ice-cream-sandwich
compilation issue
Merge branch 'master' into ice-cream-sandwich
1.9.5.1
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
synchronization with beta branch
formatting
Merge branch 'master' into ice-cream-sandwich
std:: prefix
1.9.5.2
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich