fixed NPE
Merge branch 'master' into ice-cream-sandwich
updated version num
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
version => 1.10.0.2
one more NPE

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

Conflicts:
	AndroidManifest.xml