possible fix for NPE in 1.9.5
Merge branch 'master' into nook
compilation issue
Merge branch 'master' into nook
1.9.5.1
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml
synchronization with beta branch
formatting
Merge branch 'master' into nook
std:: prefix
1.9.5.2
updated ChangeLog
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml